Add possibility to define externally added secrets (e.g. created by… (#…

…38)
gomods · May 29, 2023 · 8814fe8 · 8814fe8
1 parent 34b4d15
commit 8814fe8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/charts/athens-proxy/Chart.yaml b/charts/athens-proxy/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: athens-proxy
-version: 0.6.1
+version: 0.7.0
 appVersion: v0.12.0
 description: The proxy server for Go modules
 icon: https://raw.githubusercontent.com/gomods/athens/main/docs/static/banner.png

diff --git a/charts/athens-proxy/templates/deployment.yaml b/charts/athens-proxy/templates/deployment.yaml
@@ -52,10 +52,16 @@ spec:
             mountPath: /ssh-keys
           {{- $dot := . -}}
           {{- range $server := .Values.sshGitServers }}
+          {{- if $server.existingSecret }}
+          - name: ssh-git-servers-secret-{{ $server.host | replace "." "-" }}
+            mountPath: "{{ template "home" $dot }}/.ssh/id_rsa-{{ $server.host }}"
+            subPath: {{ $server.existingSecret.subPath | quote }}
+          {{- else }}
           - name: ssh-git-servers-secret
             mountPath: {{ template "home" $dot }}/.ssh/id_rsa-{{ $server.host }}
             subPath: id_rsa-{{ $server.host }}
           {{- end }}
+          {{- end }}
           {{- if .Values.image.runAsNonRoot }}
           securityContext:
             runAsUser: 1000
@@ -227,6 +233,13 @@ spec:
           mountPath: "/etc/gitconfig"
           subPath: "gitconfig"
         {{- end }}
+        {{- range $server := .Values.sshGitServers }}
+        {{- if $server.existingSecret }}
+        - name: ssh-git-servers-secret-{{ $server.host | replace "." "-" }}
+          mountPath: "/root/.ssh/id_rsa-{{ $server.host }}"
+          subPath: {{ $server.existingSecret.subPath | quote }}
+        {{- end }}
+        {{- end }}
         {{- if .Values.image.runAsNonRoot }}
         securityContext:
           runAsUser: 1000
@@ -263,6 +276,13 @@ spec:
       - name: ssh-git-servers-secret
         secret:
           secretName: {{ template "fullname" . }}-ssh-git-servers
+      {{- range $server := .Values.sshGitServers }}
+      {{- if $server.existingSecret }}
+      - name: ssh-git-servers-secret-{{ $server.host | replace "." "-" }}
+        secret:
+          secretName: {{ $server.existingSecret.name | quote }}
+      {{- end }}
+      {{- end }}
       {{- end }}
       {{- if .Values.gitconfig.enabled }}
       - name: gitconfig

diff --git a/charts/athens-proxy/templates/secret-ssh-git-servers.yaml b/charts/athens-proxy/templates/secret-ssh-git-servers.yaml
@@ -6,6 +6,8 @@ metadata:
 type: Opaque
 data:
 {{- range $server := .Values.sshGitServers }}
+  {{- if (not $server.existingSecret) -}}
   id_rsa-{{ $server.host }}: {{ $server.privateKey | b64enc | quote }}
+  {{- end -}}
 {{- end }}
 {{- end -}}
diff --git a/charts/athens-proxy/values.yaml b/charts/athens-proxy/values.yaml
@@ -159,6 +159,10 @@ sshGitServers: {}
   #     -----END RSA PRIVATE KEY-----
   ## ssh port
   #   port: 22
+  ## ssh private key from the existing secret (to be added separately in "Secret" Resource)
+  #   existingSecret:
+  #     name: ssh-keys
+  #     subPath: secret.id_rsa
 
 goGetWorkers: 3