Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reflect configuration as env on Helm chart #7

Merged
merged 4 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/ingressh/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 0 additions & 14 deletions charts/ingressh/templates/configmap.yaml

This file was deleted.

19 changes: 11 additions & 8 deletions charts/ingressh/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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" $) }}
Expand Down
8 changes: 6 additions & 2 deletions charts/ingressh/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand All @@ -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

Expand Down
3 changes: 0 additions & 3 deletions manifests/server/server_config.yaml

This file was deleted.

Loading