Merge pull request #43 from rhpds/revert-42-agonzalezrh-patch-2

Revert "Remove wetty terminal configuration"

Author: agonzalezrh

charts/zerotouch/Chart.yaml

@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.9.19
+version: 1.9.18
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/zerotouch/templates/deployment.yaml

@@ -410,7 +410,36 @@ spec:
           {{- toYaml $.Values.wetty.resources | nindent 10 }}
 {{- end }}
 
-
+{{- range $hostIndex, $host := .Values.wetty.ssh.terminals | default (list) }}
+{{- range $i, $terminal := $host.terminals | default (list) }}
+      - name: wetty-{{ $terminal.name | replace "_" "-" }}
+        image: {{ $.Values.wetty.image }}
+        imagePullPolicy: IfNotPresent
+        args:
+        - --base="/{{ $.Values.wetty.base }}/"
+        - --port={{ add $.Values.wetty.port ($.Values.wetty.ssh.sshOtherHosts | len) 1 $i }}
+{{-   if eq $.Values.wetty.ssh.autoSshToBastion "true" }}
+        - --ssh-host={{ $host.name }}
+        - --ssh-port={{ $.Values.wetty.ssh.sshPort }}
+        - --ssh-user={{ $.Values.wetty.ssh.sshUser }}
+        - --ssh-auth={{ $.Values.wetty.ssh.sshAuth }}
+        - --ssh-pass={{ $.Values.wetty.ssh.sshPass }}
+        - --command="{{ $terminal.command }}"
+{{-   end }}
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: GUID
+          value: "{{ $.Values.guid }}"
+        ports:
+        - containerPort: {{ add $.Values.wetty.port ($.Values.wetty.ssh.sshOtherHosts | len) 1 $i }}
+          protocol: TCP
+        resources:
+          {{- toYaml $.Values.wetty.resources | nindent 10 }}
+{{- end }}
+{{- end }}
 {{- end }}
 
 {{- if eq .Values.novnc.setup "true" }}