Skip to content

Commit 198325c

Browse files
jeanp413jeanp413
authored
Merge branch 'main' into jp/fix-ws-location
2 parents e0637e2 + 88e5beb commit 198325c

File tree

233 files changed

+8616
-4278
lines changed

Some content is hidden

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

233 files changed

+8616
-4278
lines changed

‎.prettierrc.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,13 @@
22
"printWidth": 120,
33
"tabWidth": 4,
44
"endOfLine": "auto",
5-
"trailingComma": "all"
5+
"trailingComma": "all",
6+
"overrides": [
7+
{
8+
"files": [".werft/**/*.yaml"],
9+
"options": {
10+
"tabWidth": 2
11+
}
12+
}
13+
]
614
}

‎.werft/.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
vm/charts/**
2+
vm/manifests/**

‎.werft/aks-installer-tests.yaml

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ pod:
55
nodeAffinity:
66
requiredDuringSchedulingIgnoredDuringExecution:
77
nodeSelectorTerms:
8-
- matchExpressions:
9-
- key: dev/workload
10-
operator: In
11-
values:
12-
- "builds"
8+
- matchExpressions:
9+
- key: dev/workload
10+
operator: In
11+
values:
12+
- "builds"
1313
securityContext:
1414
runAsUser: 0
1515
volumes:
@@ -19,19 +19,14 @@ pod:
1919
- name: sh-playground-dns-perm
2020
secret:
2121
secretName: sh-playground-dns-perm
22-
- name: sh-aks-perm
23-
secret:
24-
secretName: aks-credentials
2522
containers:
2623
- name: nightly-test
27-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-werft-cred.0
24+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2
2825
workingDir: /workspace
2926
imagePullPolicy: Always
3027
volumeMounts:
3128
- name: sh-playground-sa-perm
3229
mountPath: /mnt/secrets/sh-playground-sa-perm
33-
- name: sh-aks-perm
34-
mountPath: /mnt/secrets/sh-aks-perm
3530
- name: sh-playground-dns-perm # this sa is used for the DNS management
3631
mountPath: /mnt/secrets/sh-playground-dns-perm
3732
env:
@@ -55,16 +50,8 @@ pod:
5550
secretKeyRef:
5651
name: aks-credentials
5752
key: clientsecret
58-
- name: WERFT_HOST
59-
value: "werft.werft.svc.cluster.local:7777"
6053
- name: GOOGLE_APPLICATION_CREDENTIALS
6154
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
62-
- name: WERFT_K8S_NAMESPACE
63-
value: "werft"
64-
- name: WERFT_K8S_LABEL
65-
value: "component=werft"
66-
- name: TF_VAR_sa_creds
67-
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
6855
- name: TF_VAR_dns_sa_creds
6956
value: "/mnt/secrets/sh-playground-dns-perm/sh-dns-sa.json"
7057
- name: NODENAME
@@ -78,17 +65,18 @@ pod:
7865
sleep 1
7966
set -Eeuo pipefail
8067
81-
sudo chown -R gitpod:gitpod /workspace
82-
sudo apt update && apt install gettext-base
68+
sudo chown -R gitpod:gitpod /workspace
69+
sudo apt update && apt install gettext-base
70+
71+
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
8372
84-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
73+
export TF_VAR_TEST_ID=$(echo $RANDOM | md5sum | head -c 5; echo)
8574
86-
export TF_VAR_TEST_ID=$(echo $RANDOM | md5sum | head -c 5; echo)
75+
(cd .werft && yarn install && mv node_modules ..) | werft log slice prep
76+
printf '{{ toJson . }}' > context.json
8777
88-
(cd .werft && yarn install && mv node_modules ..) | werft log slice prep
89-
printf '{{ toJson . }}' > context.json
78+
npx ts-node .werft/installer-tests.ts "STANDARD_AKS_TEST"
9079
91-
npx ts-node .werft/installer-tests.ts "STANDARD_AKS_TEST"
9280
# The bit below makes this a cron job
93-
# plugins:
94-
# cron: "15 3 * * *"
81+
plugins:
82+
cron: "15 3 * * *"

‎.werft/config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rules:
2-
- path: ".werft/build.yaml"
3-
matchesAll:
4-
- or: ["repo.ref ~= refs/heads/"]
5-
- or: ["trigger !== deleted"]
2+
- path: ".werft/build.yaml"
3+
matchesAll:
4+
- or: ["repo.ref ~= refs/heads/"]
5+
- or: ["trigger !== deleted"]

‎.werft/eks-installer-tests.yaml

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ pod:
55
nodeAffinity:
66
requiredDuringSchedulingIgnoredDuringExecution:
77
nodeSelectorTerms:
8-
- matchExpressions:
9-
- key: dev/workload
10-
operator: In
11-
values:
12-
- "builds"
8+
- matchExpressions:
9+
- key: dev/workload
10+
operator: In
11+
values:
12+
- "builds"
1313
securityContext:
1414
runAsUser: 0
1515
volumes:
@@ -21,11 +21,11 @@ pod:
2121
secretName: sh-playground-dns-perm
2222
containers:
2323
- name: nightly-test
24-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:cw-werft-cred.0
24+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2
2525
workingDir: /workspace
2626
imagePullPolicy: Always
2727
volumeMounts:
28-
- name: sh-playground-sa-perm
28+
- name: sh-playground-sa-perm # this is used for tf backend bucket
2929
mountPath: /mnt/secrets/sh-playground-sa-perm
3030
- name: sh-playground-dns-perm # this sa is used for the DNS management
3131
mountPath: /mnt/secrets/sh-playground-dns-perm
@@ -45,16 +45,8 @@ pod:
4545
secretKeyRef:
4646
name: aws-credentials
4747
key: aws-region
48-
- name: WERFT_HOST
49-
value: "werft.werft.svc.cluster.local:7777"
5048
- name: GOOGLE_APPLICATION_CREDENTIALS
5149
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
52-
- name: WERFT_K8S_NAMESPACE
53-
value: "werft"
54-
- name: WERFT_K8S_LABEL
55-
value: "component=werft"
56-
- name: TF_VAR_sa_creds
57-
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
5850
- name: TF_VAR_dns_sa_creds
5951
value: "/mnt/secrets/sh-playground-dns-perm/sh-dns-sa.json"
6052
- name: NODENAME
@@ -68,18 +60,19 @@ pod:
6860
sleep 1
6961
set -Eeuo pipefail
7062
71-
sudo chown -R gitpod:gitpod /workspace
72-
sudo apt update && apt install gettext-base
63+
sudo chown -R gitpod:gitpod /workspace
64+
sudo apt update && apt install gettext-base
65+
66+
export TF_VAR_TEST_ID="$(echo $RANDOM | md5sum | head -c 5; echo)"
7367
74-
export TF_VAR_TEST_ID="$(echo $RANDOM | md5sum | head -c 5; echo)"
68+
(cd .werft && yarn install && mv node_modules ..) | werft log slice prep
69+
printf '{{ toJson . }}' > context.json
70+
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
71+
unzip awscliv2.zip
72+
sudo ./aws/install
7573
76-
(cd .werft && yarn install && mv node_modules ..) | werft log slice prep
77-
printf '{{ toJson . }}' > context.json
78-
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
79-
unzip awscliv2.zip
80-
sudo ./aws/install
74+
npx ts-node .werft/installer-tests.ts "STANDARD_EKS_TEST"
8175
82-
npx ts-node .werft/installer-tests.ts "STANDARD_EKS_TEST"
8376
# The bit below makes this a cron job
84-
# plugins:
85-
# cron: "15 3 * * *"
77+
plugins:
78+
cron: "15 3 * * *"

‎.werft/gke-installer-tests.yaml

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,63 +5,63 @@ pod:
55
nodeAffinity:
66
requiredDuringSchedulingIgnoredDuringExecution:
77
nodeSelectorTerms:
8-
- matchExpressions:
9-
- key: dev/workload
10-
operator: In
11-
values:
12-
- "builds"
8+
- matchExpressions:
9+
- key: dev/workload
10+
operator: In
11+
values:
12+
- "builds"
1313
securityContext:
1414
runAsUser: 0
1515
volumes:
16-
- name: sh-playground-sa-perm
17-
secret:
18-
secretName: sh-playground-sa-perm
19-
- name: sh-playground-dns-perm
20-
secret:
21-
secretName: sh-playground-dns-perm
22-
containers:
23-
- name: nightly-test
24-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2
25-
workingDir: /workspace
26-
imagePullPolicy: Always
27-
volumeMounts:
2816
- name: sh-playground-sa-perm
29-
mountPath: /mnt/secrets/sh-playground-sa-perm
30-
- name: sh-playground-dns-perm # this sa is used for the DNS management
31-
mountPath: /mnt/secrets/sh-playground-dns-perm
32-
env:
33-
- name: WERFT_HOST
34-
value: "werft.werft.svc.cluster.local:7777"
35-
- name: GOOGLE_APPLICATION_CREDENTIALS
36-
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
37-
- name: TF_VAR_sa_creds
38-
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
39-
- name: TF_VAR_dns_sa_creds
40-
value: "/mnt/secrets/sh-playground-dns-perm/sh-dns-sa.json"
41-
- name: WERFT_K8S_NAMESPACE
42-
value: "werft"
43-
- name: WERFT_K8S_LABEL
44-
value: "component=werft"
45-
- name: NODENAME
46-
valueFrom:
47-
fieldRef:
48-
fieldPath: spec.nodeName
49-
command:
50-
- bash
51-
- -c
52-
- |
53-
sleep 1
54-
set -Eeuo pipefail
17+
secret:
18+
secretName: sh-playground-sa-perm
19+
- name: sh-playground-dns-perm
20+
secret:
21+
secretName: sh-playground-dns-perm
22+
containers:
23+
- name: nightly-test
24+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:ljb-werft-cli-grpc-changes.2
25+
workingDir: /workspace
26+
imagePullPolicy: Always
27+
volumeMounts:
28+
- name: sh-playground-sa-perm
29+
mountPath: /mnt/secrets/sh-playground-sa-perm
30+
- name: sh-playground-dns-perm # this sa is used for the DNS management
31+
mountPath: /mnt/secrets/sh-playground-dns-perm
32+
env:
33+
- name: WERFT_HOST
34+
value: "werft.werft.svc.cluster.local:7777"
35+
- name: GOOGLE_APPLICATION_CREDENTIALS
36+
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
37+
- name: TF_VAR_sa_creds
38+
value: "/mnt/secrets/sh-playground-sa-perm/sh-sa.json"
39+
- name: TF_VAR_dns_sa_creds
40+
value: "/mnt/secrets/sh-playground-dns-perm/sh-dns-sa.json"
41+
- name: WERFT_K8S_NAMESPACE
42+
value: "werft"
43+
- name: WERFT_K8S_LABEL
44+
value: "component=werft"
45+
- name: NODENAME
46+
valueFrom:
47+
fieldRef:
48+
fieldPath: spec.nodeName
49+
command:
50+
- bash
51+
- -c
52+
- |
53+
sleep 1
54+
set -Eeuo pipefail
5555
56-
sudo chown -R gitpod:gitpod /workspace
57-
sudo apt update && apt install gettext-base
56+
sudo chown -R gitpod:gitpod /workspace
57+
sudo apt update && apt install gettext-base
5858
59-
export TF_VAR_TEST_ID=$(echo $RANDOM | md5sum | head -c 5; echo)
59+
export TF_VAR_TEST_ID=$(echo $RANDOM | md5sum | head -c 5; echo)
6060
61-
(cd .werft && yarn install && mv node_modules ..) | werft log slice prep
62-
printf '{{ toJson . }}' > context.json
61+
(cd .werft && yarn install && mv node_modules ..) | werft log slice prep
62+
printf '{{ toJson . }}' > context.json
6363
64-
npx ts-node .werft/installer-tests.ts "STANDARD_GKE_TEST"
64+
npx ts-node .werft/installer-tests.ts "STANDARD_GKE_TEST"
6565
# The bit below makes this a cron job
6666
plugins:
6767
cron: "15 4 * * *"

0 commit comments

Comments
 (0)