Merge pull request #506 from wunderio/feature/silta-cluster-images

silta-cluster: Allow keyserver, jumphost and ES map setter image replacement

Author: ArtisKrumins

silta-cluster/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: Setup a silta kubernetes cluster.
 name: silta-cluster
-version: 1.11.0
+version: 1.12.0
 # csi-rclone external provisioner requires kubernetes 1.20+
 # https://github.com/kubernetes-csi/external-provisioner?tab=readme-ov-file#compatibility
 kubeVersion: '>=1.20.0-0'

silta-cluster/templates/daemonset.yaml

@@ -15,7 +15,7 @@ spec:
       initContainers:
         {{- if .Values.daemonset.maxMapCountSetter.enabled }}
         - name: max-map-count-setter
-          image: docker.io/bash:5
+          image: {{ .Values.daemonset.maxMapCountSetter.image }}:{{ .Values.daemonset.maxMapCountSetter.imageTag }}
           resources:
             limits:
               cpu: 100m

silta-cluster/templates/ssh-key-server.yaml

@@ -29,7 +29,7 @@ spec:
       enableServiceLinks: false
       containers:
       - name: {{ .Release.Name }}-ssh-key-server
-        image: wunderio/silta-ssh-keys:v0.1
+        image: {{ .Values.sshKeyServer.image }}:{{ .Values.sshKeyServer.imageTag }}
         ports:
           - containerPort: 80
         imagePullPolicy: Always

silta-cluster/templates/sshd-jumpserver.yaml

@@ -46,7 +46,7 @@ spec:
       enableServiceLinks: false
       containers:
       - name: {{ .Release.Name }}-jumpserver
-        image: wunderio/sshd-gitauth:v1.0
+        image: {{ .Values.gitAuth.image }}:{{ .Values.gitAuth.imageTag }}
         imagePullPolicy: Always
         ports:
           - containerPort: 22

silta-cluster/values.yaml

@@ -270,6 +270,8 @@ splash:
 # SSH Jumphost settings
 gitAuth:
   enabled: true
+  image: wunderio/sshd-gitauth
+  imageTag: v1.0
   port: 22
   keyserver:
     enabled: true
@@ -294,6 +296,8 @@ gitAuth:
 # SSH keyserver (keys.[clusterDomain])
 sshKeyServer:
   enabled: true
+  image: wunderio/silta-ssh-keys
+  imageTag: v0.1
   gitauthApiToken: ''
   apiUsername: ''
   apiPassword: ''
@@ -358,6 +362,7 @@ silta-downscaler:
 silta-proxy:
   enabled: false
 
+# https://github.com/instana/helm-charts/blob/main/instana-agent/values.yaml
 instana-agent:
   enabled: false
 
@@ -487,3 +492,5 @@ daemonset:
   # https://www.elastic.co/guide/en/cloud-on-k8s/master/k8s-virtual-memory.html#k8s_using_a_daemonset_to_set_virtual_memory
   maxMapCountSetter:
     enabled: true
+    image: docker.io/bash
+    imageTag: "5"