Skip to content

Commit

Permalink
Revert "Create engineer specific staging environment" (#54052)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ebonsignori authored Jan 22, 2025
1 parent 2f10744 commit 6c789b8
Show file tree
Hide file tree
Showing 43 changed files with 39 additions and 894 deletions.
1 change: 0 additions & 1 deletion .devcontainer/.gh-kustomize-version

This file was deleted.

11 changes: 2 additions & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@

// Install features. Type 'feature' in the VS Code command palette for a full list.
"features": {
"ghcr.io/devcontainers/features/sshd:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {}
"sshd": "latest"
},

"customizations": {
Expand Down Expand Up @@ -44,11 +43,6 @@
"permissions": {
"contents": "write"
}
},
"github/gh-kustomize": {
"permissions": {
"contents": "read"
}
}
}
}
Expand All @@ -63,9 +57,8 @@
}
},

"onCreateCommand": ".devcontainer/on-create-command.sh",
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": ".devcontainer/post-create-command.sh",
"postCreateCommand": "npm ci",

// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node",
Expand Down
1 change: 0 additions & 1 deletion .devcontainer/on-create-command.sh

This file was deleted.

1 change: 0 additions & 1 deletion .devcontainer/post-create-command.sh

This file was deleted.

9 changes: 0 additions & 9 deletions config/kubernetes/production/README.md

This file was deleted.

50 changes: 28 additions & 22 deletions config/kubernetes/production/deployments/webapp.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This file was generated with Kustomize. Please do not edit manually.
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -10,42 +9,49 @@ spec:
app: webapp
template:
metadata:
labels:
app: webapp
annotations:
# Our internal logs aren't structured so we use logfmt_sloppy to just log stdout and error
# See https://thehub.github.com/epd/engineering/dev-practicals/observability/logging/ for more details
fluentbit.io/parser: logfmt_sloppy
observability.github.com/splunk_index: docs-internal
labels:
app: webapp
spec:
dnsPolicy: Default
containers:
- envFrom:
- name: webapp
image: docs-internal
resources:
requests:
cpu: 8000m
memory: 10Gi
limits:
cpu: 16000m
memory: 14Gi
ports:
- name: http
containerPort: 4000
protocol: TCP
envFrom:
- secretRef:
name: vault-secrets
- configMapRef:
name: kube-cluster-metadata
# application-config is crated at deploy time from
# configuration set in config/moda/configuration/*/env.yaml
- configMapRef:
name: application-config
image: docs-internal
# Zero-downtime deploys
# https://thehub.github.com/engineering/products-and-services/internal/moda/feature-documentation/pod-lifecycle/#required-prestop-hook
# https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
lifecycle:
preStop:
exec:
command:
- sleep
- '5'
name: webapp
ports:
- containerPort: 4000
name: http
protocol: TCP
command: ['sleep', '5']
readinessProbe:
initialDelaySeconds: 5
httpGet:
# WARNING: This should be updated to a meaningful endpoint for your application which will return a 200 once the app is fully started.
# See: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes
path: /healthz
port: http
initialDelaySeconds: 5
resources:
limits:
cpu: 16000m
memory: 14Gi
requests:
cpu: 8000m
memory: 10Gi
dnsPolicy: Default
15 changes: 9 additions & 6 deletions config/kubernetes/production/services/webapp.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
# This file was generated with Kustomize. Please do not edit manually.
apiVersion: v1
kind: Service
metadata:
annotations:
moda.github.net/dns-registration-enabled: 'false'
moda.github.net/domain-name: docs.internal.github.com
moda.github.net/load-balancer-type: public-external-http
name: webapp
labels:
service: webapp
name: webapp
annotations:
moda.github.net/domain-name: 'docs-internal.github.com'
moda.github.net/dns-registration-enabled: 'false'
moda.github.net/load-balancer-type:
public-external-http
# moda.github.net/allowed-ips: '23.235.32.0/20,43.249.72.0/22,103.244.50.0/24,103.245.222.0/23,103.245.224.0/24,104.156.80.0/20,140.248.64.0/18,140.248.128.0/17,146.75.0.0/17,151.101.0.0/16,157.52.64.0/18,167.82.0.0/17,167.82.128.0/20,167.82.160.0/20,167.82.224.0/20,172.111.64.0/18,185.31.16.0/22,199.27.72.0/21,199.232.0.0/1'
# ipv6 addresses not included
# curl -i "https://api.fastly.com/public-ip-list"
spec:
ports:
- name: http
Expand Down
9 changes: 0 additions & 9 deletions config/kubernetes/staging-ashishkeshan/README.md

This file was deleted.

51 changes: 0 additions & 51 deletions config/kubernetes/staging-ashishkeshan/deployments/webapp.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions config/kubernetes/staging-ashishkeshan/services/webapp.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions config/kubernetes/staging-ebonsignori/README.md

This file was deleted.

51 changes: 0 additions & 51 deletions config/kubernetes/staging-ebonsignori/deployments/webapp.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions config/kubernetes/staging-ebonsignori/services/webapp.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions config/kubernetes/staging-hectorsector/README.md

This file was deleted.

51 changes: 0 additions & 51 deletions config/kubernetes/staging-hectorsector/deployments/webapp.yaml

This file was deleted.

19 changes: 0 additions & 19 deletions config/kubernetes/staging-hectorsector/services/webapp.yaml

This file was deleted.

Loading

0 comments on commit 6c789b8

Please sign in to comment.