Customizable init container image

Author: ntriller-plaid

charts/athens-proxy/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: athens-proxy
-version: 0.15.3
+version: 0.15.4
 appVersion: v0.16.1
 kubeVersion: ">= 1.19-0"
 description: The proxy server for Go modules

charts/athens-proxy/README.md

@@ -1,6 +1,6 @@
 # Athens Proxy Helm Chart: athens-proxy
 
-![Version: 0.15.3](https://img.shields.io/badge/Version-0.15.3-informational?style=flat-square) ![AppVersion: v0.16.1](https://img.shields.io/badge/AppVersion-v0.16.1-informational?style=flat-square)
+![Version: 0.15.4](https://img.shields.io/badge/Version-0.15.4-informational?style=flat-square) ![AppVersion: v0.16.1](https://img.shields.io/badge/AppVersion-v0.16.1-informational?style=flat-square)
 
 ## What is Athens?
 
@@ -71,6 +71,9 @@ This will deploy a single Athens instance in the `athens` namespace with `disk`
 | ingress.enabled | bool | `false` | Create an Ingress resource for athens |
 | ingress.hosts | list | `[]` | Provide an array of values for the ingress host mapping |
 | ingress.tls | list | `[]` |  |
+| initContainerImage.registry | string | `"docker.io"` | sshGitServers init container image registry |
+| initContainerImage.repository | string | `"alpine"` | sshGitServers init container image repository |
+| initContainerImage.tag | float | `3.9` | sshGitServers init container image tag |
 | initContainerResources | object | `{}` | sshGitServers init container resources |
 | initContainerSecurityContext | object | `{}` | sshGitServers init container security context configuration |
 | jaeger.annotations | object | `{}` |  |

charts/athens-proxy/templates/deployment.yaml

@@ -52,7 +52,7 @@ spec:
       initContainers:
       {{- if .Values.sshGitServers }}
         - name: copy-key-files
-          image: alpine:3.9
+          image: "{{ .Values.initContainerImage.registry }}/{{ .Values.initContainerImage.repository }}:{{ .Values.initContainerImage.tag }}"
           command:
             - sh
             - -c

charts/athens-proxy/tests/init_container_image_test.yaml

@@ -0,0 +1,46 @@
+templates:
+- deployment.yaml
+- config-upstream.yaml
+- config-ssh-git-servers.yaml
+- secret-ssh-git-servers.yaml
+
+tests:
+- it: should default init container image configuration correctly
+  template: deployment.yaml
+  set:
+    sshGitServers:
+    - host: git.example.com
+      path: "/asd"
+      user: git
+      privateKey: |
+        -----BEGIN RSA PRIVATE KEY-----
+        -----END RSA PRIVATE KEY-----
+      port: 22
+  asserts:
+  - hasDocuments:
+      count: 1
+  - equal:
+      path: spec.template.spec.initContainers[0].image
+      value: "docker.io/library/alpine:3.9"
+
+- it: should reflect customized init container image configuration
+  template: deployment.yaml
+  set:
+    initContainerImage:
+      registry: google.com
+      repository: hello/world
+      tag: 1.0.0
+    sshGitServers:
+    - host: git.example.com
+      path: "/asd"
+      user: git
+      privateKey: |
+        -----BEGIN RSA PRIVATE KEY-----
+        -----END RSA PRIVATE KEY-----
+      port: 22
+  asserts:
+  - hasDocuments:
+      count: 1
+  - equal:
+      path: spec.template.spec.initContainers[0].image
+      value: "google.com/hello/world:1.0.0"

charts/athens-proxy/values.yaml

@@ -234,6 +234,14 @@ sshGitServers: []
   #     name: ssh-keys
   #     subPath: secret.id_rsa
 
+initContainerImage:
+  # -- sshGitServers init container image registry
+  registry: docker.io
+  # -- sshGitServers init container image repository
+  repository: library/alpine
+  # -- sshGitServers init container image tag
+  tag: 3.9
+
 # -- sshGitServers init container security context configuration
 initContainerSecurityContext: {}
   # allowPrivilegeEscalation: false