Merge pull request #7 from LeoColomb/fix/config-chart

Reflect configuration as env on Helm chart
Kooper · Apr 11, 2024 · ad2d639 · ad2d639
2 parents 3dca628 + 090a6ea
commit ad2d639
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 29 deletions.
diff --git a/charts/ingressh/Chart.yaml b/charts/ingressh/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-version: 1.0.0
+version: 2.0.0
 name: ingressh
 description: SSH ingress for Kubernetes
-appVersion: "alpha"
+appVersion: "v0.1.0-alpha"
 type: application
 keywords:
   - ingress

diff --git a/charts/ingressh/templates/configmap.yaml b/charts/ingressh/templates/configmap.yaml
diff --git a/charts/ingressh/templates/deployment.yaml b/charts/ingressh/templates/deployment.yaml
@@ -61,9 +61,17 @@ spec:
           {{- if .Values.containerSecurityContext.enabled }}
           securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
           {{- end }}
-          args:
-            - --ssh-config
-            - /config/server_config.yaml
+          env:
+            - name: SSH_BIND_ADDRESS
+              value: ":{{ .Values.containerPorts.ssh }}"
+            {{- if .Values.ingressh.hostKeyFile }}
+            - name: HOST_KEY_FILE
+              value: {{ .Values.ingressh.hostKeyFile | quote }}
+            {{- end }}
+            {{- if .Values.ingressh.debugImage }}
+            - name: DEBUG_IMAGE
+              value: {{ .Values.ingressh.debugImage | quote }}
+            {{- end }}
           ports:
             - name: ssh
               containerPort: {{ .Values.containerPorts.ssh }}
@@ -86,18 +94,13 @@ spec:
               path: /readyz
               port: http-probe
           volumeMounts:
-            - name: config-volume
-              mountPath: /config
             - name: secret-volume
               mountPath: /secret
               readOnly: true
         {{- if .Values.sidecars }}
         {{- include "common.tplvalues.render" (dict "value" .Values.sidecars "context" $) | nindent 8 }}
         {{- end }}
       volumes:
-        - name: config-volume
-          configMap:
-            name: {{ printf "%s-configuration" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" }}
         - name: secret-volume
           secret:
             secretName: {{ include "common.secrets.name" (dict "defaultNameSuffix" "privatekey" "context" $) }}

diff --git a/charts/ingressh/values.yaml b/charts/ingressh/values.yaml
@@ -58,8 +58,8 @@ diagnosticMode:
 
 ## @section IngreSsh Image parameters
 image:
-  registry: docker.io
-  repository: kuberstein/ingressh
+  registry: ghcr.io
+  repository: kooper/ingressh
   ## Defaults to '{{ .Chart.AppVersion }}'
   ##
   tag: ""
@@ -86,9 +86,13 @@ image:
 ## IngreSsh settings based on environment variables
 ## @param ingressh.sshPrivateKey IngreSsh server private key
 ## @param ingressh.existingSecret Name of existing secret containing the IngreSsh server private key
+## @param ingressh.hostKeyFile File path of the host private key
+## @param ingressh.debugImage Container image used for Debug sessions
 ingressh:
   sshPrivateKey: ""
   existingSecret: ""
+  hostKeyFile: ""
+  debugImage: ""
 
 ## @section Deployment parameters
 

diff --git a/manifests/server/server_config.yaml b/manifests/server/server_config.yaml