support annotations on services

scality · Nov 1, 2022 · 64368c6 · 64368c6
1 parent c3694cd
commit 64368c6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/manifests/templates/deployment.yaml b/manifests/templates/deployment.yaml
@@ -34,11 +34,23 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
+            - name: daemon-port
+              containerPort: {{ .Values.daemonPort }}
+            - name: client-port
+              containerPort: {{ .Values.clientPort }}
             {{- range .Values.ports }}
             - name: {{ .name }}
               containerPort:  {{ .containerPort }}
             {{- end }}
           env:
+            - name: "SSH_PORT_LISTEN_DAEMON"
+              value: "{{ .Values.daemonPort }}"
+            - name: "SSH_PORT_LISTEN_CLIENT"
+              value: "{{ .Values.clientPort }}"
+            - name: "USE_PROXY_PROTOCOL"
+              value: "0"
+            - name: "SSH_KEYS_PATH"
+              value: "/etc/tmate-ssh-server/keys"
             {{- range .Values.env }}
             - name: {{ .name | quote }}
               value:  {{ .value | quote }}

diff --git a/manifests/templates/tmate-server-loadbalancer-client.yaml b/manifests/templates/tmate-server-loadbalancer-client.yaml
@@ -2,6 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: tmate-server-lb-client
+  {{- with .Values.clientAnnotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
 # https://cloud.google.com/kubernetes-engine/docs/concepts/service-load-balancer-parameters#fw_ip_address
   {{- with .Values.loadBalancerSourceRanges }}

diff --git a/manifests/templates/tmate-server-loadbalancer-daemon.yaml b/manifests/templates/tmate-server-loadbalancer-daemon.yaml
@@ -2,6 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: tmate-server-lb
+  {{- with .Values.daemonAnnotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
 # https://cloud.google.com/kubernetes-engine/docs/concepts/service-load-balancer-parameters#fw_ip_address
   ports:

diff --git a/manifests/values.yaml b/manifests/values.yaml
@@ -46,6 +46,13 @@ service:
   type: ClusterIP
   port: 80
 
+
+daemonPort: 2200
+clientPort: 2201
+
+clientAnnotations: {}
+daemonAnnotations: {}
+
 ingress:
   enabled: false
   className: ""