Skip to content

Commit 056a569

Browse files
committed
fixed path of yamls and added mutating webhook
1 parent f277c73 commit 056a569

File tree

2 files changed

+75
-53
lines changed

2 files changed

+75
-53
lines changed

installation-script

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -40,48 +40,48 @@ if !baseURL {
4040
if !gitToken {
4141
log("gitToken is mandatory");
4242
}
43-
argocd = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/argocd.yaml");
44-
chartmuseum = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/chartmuseum.yaml");
45-
clair = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/clair.yaml");
46-
clairConfig = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/clair-config.yaml");
47-
dashboard = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/dashboard.yaml");
48-
gitSensor = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/gitsensor.yaml");
49-
guard = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/guard.yaml");
50-
postgresql = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/postgresql.yaml");
51-
imageScanner = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/image-scanner.yaml");
52-
kubewatch = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/kubewatch.yaml");
53-
lens = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/lens.yaml");
54-
migrator = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/migrator.yaml");
55-
natsOperator = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/nats-operator.yaml");
56-
natsServer = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/nats-server.yaml");
57-
natsStreaming = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/nats-streaming.yaml");
58-
notifier = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/notifier.yaml");
59-
devtron = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/devtron.yaml");
60-
devtronDexIngress = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/devtron-dex-ingress.yaml");
61-
workflow = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/workflow.yaml");
62-
serviceAccount = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/serviceaccount.yaml");
63-
namespace = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/namespace.yaml");
64-
externalSecret = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/yamls/namespace.yaml");
65-
66-
namespaces = kubectl apply namespace;
67-
sa = kubectl apply serviceAccount;
43+
argocd = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/argocd.yaml");
44+
chartmuseum = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/chartmuseum.yaml");
45+
clair = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/clair.yaml");
46+
clairConfig = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/clair-config.yaml");
47+
dashboard = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/dashboard.yaml");
48+
gitSensor = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/gitsensor.yaml");
49+
guard = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/guard.yaml");
50+
postgresql = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/postgresql.yaml");
51+
imageScanner = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/image-scanner.yaml");
52+
kubewatch = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/kubewatch.yaml");
53+
lens = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/lens.yaml");
54+
migrator = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/migrator.yaml");
55+
natsOperator = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-operator.yaml");
56+
natsServer = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-server.yaml");
57+
natsStreaming = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/nats-streaming.yaml");
58+
notifier = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/notifier.yaml");
59+
devtron = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/devtron.yaml");
60+
devtronDexIngress = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/devtron-dex-ingress.yaml");
61+
workflow = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/workflow.yaml");
62+
serviceAccount = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/serviceaccount.yaml");
63+
namespace = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/namespace.yaml");
64+
externalSecret = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/yamls/namespace.yaml");
65+
66+
#namespaces = kubectl apply namespace;
67+
#sa = kubectl apply serviceAccount;
6868

6969

7070
#externalSecret
7171
yamlEdit(externalSecret, "data.AWS_REGION", externalSecretAmazonRegion, 1);
72-
externalSecret = kubectl apply -n devtroncd externalSecret;
72+
#externalSecret = kubectl apply -n devtroncd externalSecret;
7373

7474
#postgresql
7575
# if postgres already installed skip installation
7676
hasPostgresql = kubectl get sts postgresql-postgresql -n devtroncd;
7777
if !hasPostgresql {
78-
postgresqlOverride = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/updates/postgresql.yaml");
78+
postgresqlOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/postgresql.yaml");
7979
yamlEdit(postgresql, "data.postgresql-password", postgresqlPassword, 0);
80-
postgresql = kubectl apply -n devtroncd postgresql -u postgresqlOverride;
80+
# postgresql = kubectl apply -n devtroncd postgresql -u postgresqlOverride;
8181
}
8282
#argocd
8383
hasArgocd = kubectl get deployment argocd-server -n devtroncd;
84-
argocdOverride = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/updates/argocd.yaml");
84+
argocdOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/argocd.yaml");
8585
#if argocd present then dont patch
8686
#if hasArgocd {
8787
# argocdCM = kubectl get cm argocd-cm -n devtroncd;
@@ -108,7 +108,7 @@ yamlEdit(argocd, `data.dex\.config`, dexConfig, 15);
108108

109109
yamlEdit(argocd, `subjects.0.namespace`, "devtroncd", 14);
110110
yamlEdit(argocd, `subjects.0.namespace`, "devtroncd", 13);
111-
argocd = kubectl apply -n devtroncd argocd -u argocdOverride;
111+
#argocd = kubectl apply -n devtroncd argocd -u argocdOverride;
112112
#patchLoad = '{"data":{"url":"' + baseURL + '", "dex.config:"' + dexConfig + '}}';
113113
#pa = kubectl patch -n devtroncd cm/argocd-cm --type "application/merge-patch+json" -p patchLoad;
114114

@@ -129,27 +129,30 @@ yamlEdit(lens, "data.PG_PASSWORD", postgresqlPassword, 0);
129129
#migrator
130130
#delete migrator job
131131
yamlEdit(migrator, "data.DB_PASSWORD", postgresqlPassword, 0);
132-
migrator = kubectl apply -n devtroncd migrator;
132+
#migrator = kubectl apply -n devtroncd migrator;
133133

134134
#nats
135-
natsOperator = kubectl apply -n devtroncd natsOperator;
136-
natsServer = kubectl apply -n devtroncd natsServer;
137-
natsStreaming = kubectl apply -n devtroncd natsStreaming;
135+
#natsOperator = kubectl apply -n devtroncd natsOperator;
136+
#natsServer = kubectl apply -n devtroncd natsServer;
137+
#natsStreaming = kubectl apply -n devtroncd natsStreaming;
138138

139139
#guard
140140
makeCertsDir = `#!/bin/bash
141141
mkdir -p /tmp/certs`;
142142
makeCertsDir = shellScript makeCertsDir;
143-
certGen = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/generate_certificate.sh");
144-
grumpyConfig = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/grumpy_config.txt", "/tmp/certs/grumpy_config.txt");
145-
caConfig = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/ca_config.txt", "/tmp/certs/ca_config.txt");
143+
certGen = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/generate_certificate.sh");
144+
grumpyConfig = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/grumpy_config.txt", "/tmp/certs/grumpy_config.txt");
145+
caConfig = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/ca_config.txt", "/tmp/certs/ca_config.txt");
146146
certs = shellScript certGen;
147147
crt = base64EncoderPrefix + "cat /tmp/certs/grumpy-crt.pem" + base64EncoderSuffix;
148148
crt = shellScript crt;
149149
key = base64EncoderPrefix + "cat /tmp/certs/grumpy-key.pem" + base64EncoderSuffix;
150150
key = shellScript key;
151+
cacrt = base64EncoderPrefix + "cat /tmp/certs/ca.crt" + base64EncoderSuffix;
152+
cacrt = shellScript cacrt;
151153
yamlEdit(guard, `data.cert\.pem`, crt, 0);
152154
yamlEdit(guard, `data.key\.pem`, key, 0);
155+
yamlEdit(guard, "webhooks.0.clientConfig.caBundle", cacrt, 4);
153156

154157
#chartmuseum
155158
yamlEdit(chartmuseum, "data.CHARTMUSEUM_STORAGE_AMAZON_BUCKET", chartmuseumStorageAmazonBucket, 1);
@@ -237,22 +240,22 @@ externaSecretRegion = `env:
237240

238241
yamlEdit(devtron, `data.dt-k8s-external-secret\.yaml`, externaSecretRegion, 2);
239242

240-
devtronOverride = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/updates/devtron.yaml");
241-
devtron = kubectl apply -n devtroncd devtron -u devtronOverride;
242-
devtronDexIngress = kubectl apply -n devtroncd devtronDexIngress;
243+
devtronOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/devtron.yaml");
244+
#devtron = kubectl apply -n devtroncd devtron -u devtronOverride;
245+
#devtronDexIngress = kubectl apply -n devtroncd devtronDexIngress;
243246

244-
guard = kubectl apply -n devtroncd guard;
245-
dashboard = kubectl apply -n devtroncd dashboard;
247+
#guard = kubectl apply -n devtroncd guard;
248+
#dashboard = kubectl apply -n devtroncd dashboard;
246249

247-
gitSensorOverride = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/updates/gitsensor.yaml");
248-
gitSensor = kubectl apply -n devtroncd gitSensor -u gitSensorOverride;
249-
imageScannerOverride = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/updates/image-scanner.yaml");
250-
imageScanner = kubectl apply -n devtroncd imageScanner -u imageScannerOverride;
251-
kubewatch = kubectl apply -n devtroncd kubewatch;
252-
lensOverride = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/updates/lens.yaml");
253-
lens = kubectl apply -n devtroncd lens -u lensOverride;
254-
notifierOverride = download("https://raw.githubusercontent.com/pghildiyal/devtron-installation-script/main/updates/notifier.yaml");
255-
notifier = kubectl apply -n devtroncd notifier -u notifierOverride;
250+
gitSensorOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/gitsensor.yaml");
251+
#gitSensor = kubectl apply -n devtroncd gitSensor -u gitSensorOverride;
252+
imageScannerOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/image-scanner.yaml");
253+
#imageScanner = kubectl apply -n devtroncd imageScanner -u imageScannerOverride;
254+
#kubewatch = kubectl apply -n devtroncd kubewatch;
255+
lensOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/lens.yaml");
256+
#lens = kubectl apply -n devtroncd lens -u lensOverride;
257+
notifierOverride = download("https://raw.githubusercontent.com/devtron-labs/devtron-installation-script/main/updates/notifier.yaml");
258+
#notifier = kubectl apply -n devtroncd notifier -u notifierOverride;
256259

257260
workflowConfig = `parallelism: 50
258261
artifactRepository:
@@ -270,7 +273,7 @@ containerRuntimeExecutor: pns
270273
executor:
271274
imagePullPolicy: Always`;
272275
yamlEdit(workflow, "data.config", workflowConfig, 10);
273-
workflow = kubectl apply -n argo workflow;
276+
#workflow = kubectl apply -n argo workflow;
274277

275278
postgresPlainPwd = base64DecoderPrefix + `echo "` + postgresqlPassword + `" | tr -d ':\n' ` + base64DecoderSuffix;
276279
postgresPlainPwd = shellScript postgresPlainPwd;
@@ -279,4 +282,4 @@ yamlEdit(clairConfig, "clair.database.options.source", clairPosrgresUrl, 0);
279282
clairEncodedConfig = base64EncoderPrefix + `echo "` + clairConfig + `"` + base64EncoderSuffix;
280283
clairEncodedConfig = shellScript clairEncodedConfig;
281284
yamlEdit(clair, `data.config\.yaml`, clairEncodedConfig, 0);
282-
clair = kubectl apply -n devtroncd clair;
285+
#clair = kubectl apply -n devtroncd clair;

yamls/guard.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,22 @@ spec:
127127
secret:
128128
secretName: guard-secret
129129
revisionHistoryLimit: 3
130+
---
131+
apiVersion: admissionregistration.k8s.io/v1beta1
132+
kind: ValidatingWebhookConfiguration
133+
metadata:
134+
name: grumpy
135+
webhooks:
136+
- name: grumpy.pipo02mix.org
137+
clientConfig:
138+
service:
139+
name: guard-service
140+
namespace: devtroncd
141+
path: "/validate"
142+
caBundle: ""
143+
rules:
144+
- operations: ["CREATE","UPDATE"]
145+
apiGroups: [""]
146+
apiVersions: ["v1"]
147+
resources: ["pods"]
148+
failurePolicy: Ignore

0 commit comments

Comments
 (0)