diff --git a/charts/showroom-single-pod/Chart.yaml b/charts/showroom-single-pod/Chart.yaml index 1ef376d..9df17a2 100644 --- a/charts/showroom-single-pod/Chart.yaml +++ b/charts/showroom-single-pod/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: 0.0.7 +version: 0.0.8 # 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 diff --git a/charts/showroom-single-pod/templates/deployment.yaml b/charts/showroom-single-pod/templates/deployment.yaml index 2ee2c90..292decf 100644 --- a/charts/showroom-single-pod/templates/deployment.yaml +++ b/charts/showroom-single-pod/templates/deployment.yaml @@ -42,17 +42,17 @@ spec: image: {{ .Values.content.image }} imagePullPolicy: {{ .Values.content.imagePullPolicy }} env: - - name: GIT_REPO_URL - value: {{ .Values.content.repoUrl }} - - name: GIT_REPO_REF - value: {{ .Values.content.repoRef }} - - name: ANTORA_PLAYBOOK - value: {{ .Values.content.antoraPlaybook }} + - name: GIT_REPO_URL + value: {{ .Values.content.repoUrl }} + - name: GIT_REPO_REF + value: {{ .Values.content.repoRef }} + - name: ANTORA_PLAYBOOK + value: {{ .Values.content.antoraPlaybook }} volumeMounts: - - name: user-data - mountPath: /user_data/ - - name: showroom - mountPath: /showroom/ + - name: user-data + mountPath: /user_data/ + - name: showroom + mountPath: /showroom/ ports: - containerPort: 8000 protocol: TCP @@ -68,17 +68,6 @@ spec: - name: terminal image: {{ .Values.terminal.image }} imagePullPolicy: IfNotPresent -# args: -# - --base={{ .Values.terminal.wetty.base }} -# - --port=8001 -# - --allow-iframe -# {{- if .Values.terminal.wetty.autoSshToBastion }} -# - --ssh-host={{ .Values.terminal.wetty.sshHost }} -# - --ssh-port={{ .Values.terminal.wetty.sshPort }} -# - --ssh-user={{ .Values.terminal.wetty.sshUser }} -# - --ssh-auth={{ .Values.terminal.wetty.sshAuth }} -# - --ssh-pass={{ .Values.terminal.wetty.sshPass }} -# {{- end }} env: - name: NAMESPACE valueFrom: @@ -87,11 +76,11 @@ spec: - name: GUID value: "{{ .Values.guid }}" volumeMounts: - - name: lab-user-home - mountPath: /home/lab-user + - name: lab-user-home + mountPath: /home/lab-user ports: - - containerPort: 7681 - protocol: TCP + - containerPort: 7681 + protocol: TCP resources: {{- toYaml .Values.terminal.resources | nindent 10 }} diff --git a/charts/showroom-single-pod/templates/terminal/secret.yaml b/charts/showroom-single-pod/templates/terminal/secret.yaml deleted file mode 100644 index 2bbc36d..0000000 --- a/charts/showroom-single-pod/templates/terminal/secret.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: terminal-secret -type: kubernetes.io/ssh-auth -data: - ssh-privatekey: | - {{- .Values.terminal.wetty.sshKey | default "nothing" | b64enc | nindent 4 }} diff --git a/charts/showroom-single-pod/values.yaml b/charts/showroom-single-pod/values.yaml index 1eb14eb..24f772a 100644 --- a/charts/showroom-single-pod/values.yaml +++ b/charts/showroom-single-pod/values.yaml @@ -40,15 +40,6 @@ terminal: setup: true image: quay.io/rhpds/openshift-showroom-terminal-ocp:latest name: terminal - # wetty: - # autoSshToBastion: false - # base: '/wetty/' - # sshHost: shared-410-bastion.openshift.redhatworkshops.io - # sshPort: 22 - # sshUser: ec2-user - # sshAuth: password - # sshPass: password - # sshKey: keyfile -- not yet supported serviceAccount: showroom-terminal resources: limits: