From dc4e12bdd6ac2bdf68ca8b8dd5bc8fbbf1b760e0 Mon Sep 17 00:00:00 2001 From: Noah Kreiger Date: Tue, 28 Feb 2023 15:03:18 -0700 Subject: [PATCH 1/5] add service links in all viable deployments at this time Signed-off-by: Noah Kreiger --- charts/ctlog/templates/ctlog-deployment.yaml | 3 +++ charts/ctlog/values.yaml | 3 ++- charts/fulcio/templates/fulcio-deployment.yaml | 3 +++ charts/fulcio/values.yaml | 1 + charts/rekor/templates/redis/deployment.yaml | 3 +++ charts/rekor/templates/server/deployment.yaml | 3 +++ charts/rekor/values.yaml | 2 ++ charts/trillian/templates/mysql/deployment.yaml | 3 +++ charts/trillian/templates/trillian-log-server/deployment.yaml | 3 +++ charts/trillian/templates/trillian-log-signer/deployment.yaml | 3 +++ charts/trillian/values.yaml | 3 +++ charts/tuf/templates/deployment.yaml | 3 +++ charts/tuf/values.yaml | 3 +++ 13 files changed, 35 insertions(+), 1 deletion(-) diff --git a/charts/ctlog/templates/ctlog-deployment.yaml b/charts/ctlog/templates/ctlog-deployment.yaml index df7c81bc..c11bc7f3 100644 --- a/charts/ctlog/templates/ctlog-deployment.yaml +++ b/charts/ctlog/templates/ctlog-deployment.yaml @@ -40,6 +40,9 @@ spec: {{- if .Values.server.securityContext }} securityContext: {{ toYaml .Values.server.securityContext | indent 8 }} + {{- end }} + {{- if .Values.server.serviceLinks }} + enableServiceLinks: {{ .Values.server.serviceLinks.enabled }} {{- end }} volumes: - name: keys diff --git a/charts/ctlog/values.yaml b/charts/ctlog/values.yaml index 610e3728..11a1ccbc 100644 --- a/charts/ctlog/values.yaml +++ b/charts/ctlog/values.yaml @@ -3,7 +3,7 @@ namespace: name: ctlog-system server: - replicaCount: 1 + replicaCount: 3 config: key: treeID treeID: "" @@ -43,6 +43,7 @@ server: annotations: {} tls: [] extraArgs: [] + serviceLinks: {} securityContext: runAsNonRoot: true runAsUser: 65533 diff --git a/charts/fulcio/templates/fulcio-deployment.yaml b/charts/fulcio/templates/fulcio-deployment.yaml index d7a8ee2e..7637ee5c 100644 --- a/charts/fulcio/templates/fulcio-deployment.yaml +++ b/charts/fulcio/templates/fulcio-deployment.yaml @@ -84,6 +84,9 @@ spec: {{- if .Values.server.securityContext }} securityContext: {{ toYaml .Values.server.securityContext | indent 8 }} + {{- end }} + {{- if .Values.server.serviceLinks }} + enableServiceLinks: {{ .Values.server.serviceLinks.enabled }} {{- end }} volumes: - name: fulcio-config diff --git a/charts/fulcio/values.yaml b/charts/fulcio/values.yaml index da0dfc12..7d9c8e20 100644 --- a/charts/fulcio/values.yaml +++ b/charts/fulcio/values.yaml @@ -11,6 +11,7 @@ server: svcPort: 80 grpcSvcPort: 5554 secret: fulcio-server-secret + serviceLinks: {} logging: production: false image: diff --git a/charts/rekor/templates/redis/deployment.yaml b/charts/rekor/templates/redis/deployment.yaml index 810f9154..53086ced 100644 --- a/charts/rekor/templates/redis/deployment.yaml +++ b/charts/rekor/templates/redis/deployment.yaml @@ -89,6 +89,9 @@ spec: {{- if .Values.redis.affinity }} affinity: {{ toYaml .Values.redis.affinity | indent 8 }} + {{- end }} + {{- if .Values.redis.serviceLinks }} + enableServiceLinks: {{ .Values.redis.serviceLinks.enabled }} {{- end }} volumes: - name: storage diff --git a/charts/rekor/templates/server/deployment.yaml b/charts/rekor/templates/server/deployment.yaml index f7794d6d..eca4b2bf 100644 --- a/charts/rekor/templates/server/deployment.yaml +++ b/charts/rekor/templates/server/deployment.yaml @@ -107,6 +107,9 @@ spec: {{- if .Values.server.affinity }} affinity: {{ toYaml .Values.server.affinity | indent 8 }} + {{- end }} + {{- if .Values.server.serviceLinks }} + enableServiceLinks: {{ .Values.server.serviceLinks.enabled }} {{- end }} volumes: - name: {{ template "rekor.sharding-config" . }} diff --git a/charts/rekor/values.yaml b/charts/rekor/values.yaml index cfd47e64..630a68a7 100644 --- a/charts/rekor/values.yaml +++ b/charts/rekor/values.yaml @@ -29,6 +29,7 @@ redis: # -- 6.2.6-alpine3.15 version: "sha256:6c42cce2871e8dc5fb3e843ed5c4e7939d312faf5e53ff0ff4ca955a7e0b2b39" resources: {} + serviceLinks: {} readinessProbe: initialDelaySeconds: 5 periodSeconds: 10 @@ -135,6 +136,7 @@ server: prometheus.io/path: /metrics prometheus.io/port: "2112" resources: {} + serviceLinks: {} extraArgs: [] serviceAccount: create: true diff --git a/charts/trillian/templates/mysql/deployment.yaml b/charts/trillian/templates/mysql/deployment.yaml index 744f21ce..6ef1aee1 100644 --- a/charts/trillian/templates/mysql/deployment.yaml +++ b/charts/trillian/templates/mysql/deployment.yaml @@ -105,6 +105,9 @@ spec: {{- if .Values.mysql.affinity }} affinity: {{ toYaml .Values.mysql.affinity | indent 8 }} + {{- end }} + {{- if .Values.mysql.serviceLinks }} + enableServiceLinks: {{ .Values.mysql.serviceLinks.enabled }} {{- end }} volumes: {{- if not .Values.mysql.persistence.enabled }} diff --git a/charts/trillian/templates/trillian-log-server/deployment.yaml b/charts/trillian/templates/trillian-log-server/deployment.yaml index 1a6964fe..564ca096 100644 --- a/charts/trillian/templates/trillian-log-server/deployment.yaml +++ b/charts/trillian/templates/trillian-log-server/deployment.yaml @@ -101,6 +101,9 @@ spec: securityContext: {{ toYaml .Values.logServer.securityContext | indent 8 }} {{- end }} + {{- if .Values.logServer.serviceLinks }} + enableServiceLinks: {{ .Values.logServer.serviceLinks.enabled }} + {{- end }} {{- if .Values.logServer.tolerations }} tolerations: {{ toYaml .Values.logServer.tolerations | indent 8 }} diff --git a/charts/trillian/templates/trillian-log-signer/deployment.yaml b/charts/trillian/templates/trillian-log-signer/deployment.yaml index fabf80f8..cad2670e 100644 --- a/charts/trillian/templates/trillian-log-signer/deployment.yaml +++ b/charts/trillian/templates/trillian-log-signer/deployment.yaml @@ -109,3 +109,6 @@ spec: affinity: {{ toYaml .Values.logSigner.affinity | indent 8 }} {{- end }} + {{- if .Values.logSigner.serviceLinks }} + enableServiceLinks: {{ .Values.logSigner.serviceLinks.enabled }} + {{- end }} \ No newline at end of file diff --git a/charts/trillian/values.yaml b/charts/trillian/values.yaml index fd6ecd31..abba1548 100644 --- a/charts/trillian/values.yaml +++ b/charts/trillian/values.yaml @@ -100,6 +100,7 @@ mysql: command: - /etc/init.d/mysql - status + serviceLinks: {} secret: annotations: {} auth: @@ -152,6 +153,7 @@ logServer: targetPort: 8090 livenessProbe: {} readinessProbe: {} + serviceLinks: {} resources: {} extraArgs: [] serviceAccount: @@ -186,6 +188,7 @@ logSigner: targetPort: 8091 livenessProbe: {} readinessProbe: {} + serviceLinks: {} resources: {} extraArgs: [] serviceAccount: diff --git a/charts/tuf/templates/deployment.yaml b/charts/tuf/templates/deployment.yaml index 88595740..2e5bee12 100644 --- a/charts/tuf/templates/deployment.yaml +++ b/charts/tuf/templates/deployment.yaml @@ -29,6 +29,9 @@ spec: {{- include "tuf.matchLabels" . | nindent 8 }} spec: serviceAccountName: {{ .Values.serviceAccountName }} + {{- if .Values.server.serviceLinks }} + enableServiceLinks: {{ .Values.server.serviceLinks.enabled }} + {{- end }} containers: - image: {{ template "tuf.image" .Values.deployment }} name: {{ .Values.deployment.name }} diff --git a/charts/tuf/values.yaml b/charts/tuf/values.yaml index 0e6cb9e5..3e60f47f 100644 --- a/charts/tuf/values.yaml +++ b/charts/tuf/values.yaml @@ -15,6 +15,9 @@ deployment: imagePullPolicy: IfNotPresent port: 8080 +server: + serviceLinks: + secrets: rekor: create: false From 69c9d35edf4cd91fe09fcaade237695646f83fcb Mon Sep 17 00:00:00 2001 From: Noah Kreiger Date: Tue, 28 Feb 2023 15:04:53 -0700 Subject: [PATCH 2/5] fix test Signed-off-by: Noah Kreiger --- .idea/workspace.xml | 58 ++++++++++++++++++++++++++++++++++++++++ charts/ctlog/values.yaml | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..7d92872e --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + true + + \ No newline at end of file diff --git a/charts/ctlog/values.yaml b/charts/ctlog/values.yaml index 11a1ccbc..46882ff5 100644 --- a/charts/ctlog/values.yaml +++ b/charts/ctlog/values.yaml @@ -3,7 +3,7 @@ namespace: name: ctlog-system server: - replicaCount: 3 + replicaCount: 1 config: key: treeID treeID: "" From f3a57e75dd43e07646617d908e77656c3aa47db4 Mon Sep 17 00:00:00 2001 From: Noah Kreiger Date: Tue, 28 Feb 2023 15:05:02 -0700 Subject: [PATCH 3/5] rm Signed-off-by: Noah Kreiger --- .idea/workspace.xml | 58 --------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 7d92872e..00000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - true - - \ No newline at end of file From 69b8f6b7df983b6e8c30f5a828d76b2e02958343 Mon Sep 17 00:00:00 2001 From: Noah Kreiger Date: Tue, 28 Feb 2023 15:05:50 -0700 Subject: [PATCH 4/5] add nl Signed-off-by: Noah Kreiger --- charts/trillian/templates/trillian-log-signer/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/trillian/templates/trillian-log-signer/deployment.yaml b/charts/trillian/templates/trillian-log-signer/deployment.yaml index cad2670e..b78669ce 100644 --- a/charts/trillian/templates/trillian-log-signer/deployment.yaml +++ b/charts/trillian/templates/trillian-log-signer/deployment.yaml @@ -111,4 +111,4 @@ spec: {{- end }} {{- if .Values.logSigner.serviceLinks }} enableServiceLinks: {{ .Values.logSigner.serviceLinks.enabled }} - {{- end }} \ No newline at end of file + {{- end }} From 1e16a9bd89e18f341dc4544d13aa047b16cfc3f5 Mon Sep 17 00:00:00 2001 From: Noah Kreiger Date: Tue, 28 Feb 2023 15:06:10 -0700 Subject: [PATCH 5/5] cleanup Signed-off-by: Noah Kreiger --- charts/tuf/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/tuf/values.yaml b/charts/tuf/values.yaml index 3e60f47f..1713aecc 100644 --- a/charts/tuf/values.yaml +++ b/charts/tuf/values.yaml @@ -16,7 +16,7 @@ deployment: port: 8080 server: - serviceLinks: + serviceLinks: {} secrets: rekor: