Skip to content

Commit 6c789b8

Browse files
authored
Revert "Create engineer specific staging environment" (#54052)
1 parent 2f10744 commit 6c789b8

File tree

43 files changed

+39
-894
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+39
-894
lines changed

.devcontainer/.gh-kustomize-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.devcontainer/devcontainer.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

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

1817
"customizations": {
@@ -44,11 +43,6 @@
4443
"permissions": {
4544
"contents": "write"
4645
}
47-
},
48-
"github/gh-kustomize": {
49-
"permissions": {
50-
"contents": "read"
51-
}
5246
}
5347
}
5448
}
@@ -63,9 +57,8 @@
6357
}
6458
},
6559

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

7063
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
7164
"remoteUser": "node",

.devcontainer/on-create-command.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

.devcontainer/post-create-command.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

config/kubernetes/production/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

config/kubernetes/production/deployments/webapp.yaml

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# This file was generated with Kustomize. Please do not edit manually.
21
apiVersion: apps/v1
32
kind: Deployment
43
metadata:
@@ -10,42 +9,49 @@ spec:
109
app: webapp
1110
template:
1211
metadata:
12+
labels:
13+
app: webapp
1314
annotations:
15+
# Our internal logs aren't structured so we use logfmt_sloppy to just log stdout and error
16+
# See https://thehub.github.com/epd/engineering/dev-practicals/observability/logging/ for more details
1417
fluentbit.io/parser: logfmt_sloppy
1518
observability.github.com/splunk_index: docs-internal
16-
labels:
17-
app: webapp
1819
spec:
20+
dnsPolicy: Default
1921
containers:
20-
- envFrom:
22+
- name: webapp
23+
image: docs-internal
24+
resources:
25+
requests:
26+
cpu: 8000m
27+
memory: 10Gi
28+
limits:
29+
cpu: 16000m
30+
memory: 14Gi
31+
ports:
32+
- name: http
33+
containerPort: 4000
34+
protocol: TCP
35+
envFrom:
2136
- secretRef:
2237
name: vault-secrets
2338
- configMapRef:
2439
name: kube-cluster-metadata
40+
# application-config is crated at deploy time from
41+
# configuration set in config/moda/configuration/*/env.yaml
2542
- configMapRef:
2643
name: application-config
27-
image: docs-internal
44+
# Zero-downtime deploys
45+
# https://thehub.github.com/engineering/products-and-services/internal/moda/feature-documentation/pod-lifecycle/#required-prestop-hook
46+
# https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks
2847
lifecycle:
2948
preStop:
3049
exec:
31-
command:
32-
- sleep
33-
- '5'
34-
name: webapp
35-
ports:
36-
- containerPort: 4000
37-
name: http
38-
protocol: TCP
50+
command: ['sleep', '5']
3951
readinessProbe:
52+
initialDelaySeconds: 5
4053
httpGet:
54+
# WARNING: This should be updated to a meaningful endpoint for your application which will return a 200 once the app is fully started.
55+
# See: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/#define-readiness-probes
4156
path: /healthz
4257
port: http
43-
initialDelaySeconds: 5
44-
resources:
45-
limits:
46-
cpu: 16000m
47-
memory: 14Gi
48-
requests:
49-
cpu: 8000m
50-
memory: 10Gi
51-
dnsPolicy: Default

config/kubernetes/production/services/webapp.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
# This file was generated with Kustomize. Please do not edit manually.
21
apiVersion: v1
32
kind: Service
43
metadata:
5-
annotations:
6-
moda.github.net/dns-registration-enabled: 'false'
7-
moda.github.net/domain-name: docs.internal.github.com
8-
moda.github.net/load-balancer-type: public-external-http
4+
name: webapp
95
labels:
106
service: webapp
11-
name: webapp
7+
annotations:
8+
moda.github.net/domain-name: 'docs-internal.github.com'
9+
moda.github.net/dns-registration-enabled: 'false'
10+
moda.github.net/load-balancer-type:
11+
public-external-http
12+
# 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'
13+
# ipv6 addresses not included
14+
# curl -i "https://api.fastly.com/public-ip-list"
1215
spec:
1316
ports:
1417
- name: http

config/kubernetes/staging-ashishkeshan/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

config/kubernetes/staging-ashishkeshan/deployments/webapp.yaml

Lines changed: 0 additions & 51 deletions
This file was deleted.

config/kubernetes/staging-ashishkeshan/services/webapp.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)