Updating the Values.yaml for several services. Cleaned out proprietary data

[it/otf.git] / otf-ping-test-head / helm / otf-ping-test-head / templates / deployment.yaml

diff --git a/otf-ping-test-head/helm/otf-ping-test-head/templates/deployment.yaml b/otf-ping-test-head/helm/otf-ping-test-head/templates/deployment.yaml
index b6cc154..1081524 100644 (file)
--- a/otf-ping-test-head/helm/otf-ping-test-head/templates/deployment.yaml
+++ b/otf-ping-test-head/helm/otf-ping-test-head/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1\r
+apiVersion: apps/v1\r
 kind: Deployment\r
 metadata:\r
   name: {{ .Values.appName}}\r
@@ -26,26 +26,30 @@ spec:
         app: {{ .Values.appName}}\r
         version: {{.Values.version}}\r
     spec:\r
+      {{ if .Values.pullSecret }}\r
+      imagePullSecrets:\r
+        - name: {{ .Values.pullSecret }}\r
+      {{ end }}\r
       serviceAccount: default\r
       volumes:\r
-      - name: {{ .Values.appName}}-cert-volume\r
-        secret:\r
-          secretName: {{.Values.sharedCert}}\r
-          optional: true\r
-          items:\r
-          - key: PEM_CERT\r
-            path: otf.pem\r
-          - key: PEM_KEY\r
-            path: privateKey.pem\r
+#      - name: {{ .Values.appName}}-cert-volume\r
+#        secret:\r
+#          secretName: {{.Values.sharedCert}}\r
+#          optional: true\r
+#          items:\r
+#          - key: PEM_CERT\r
+#            path: otf.pem\r
+#          - key: PEM_KEY\r
+#            path: privateKey.pem\r
       {{ if or (eq .Values.env "st") (eq .Values.env "prod-dr")}}\r
       {{else}}\r
       - name: logging-pvc\r
-        persistentVolumeClaim:\r
-          {{if eq .Values.env "prod"}}\r
-          claimName: {{ .Values.pvc.prod | quote }}\r
-          {{ else }}\r
-          claimName: {{ .Values.pvc.dev | quote }}\r
-          {{ end }}\r
+        #persistentVolumeClaim:\r
+        #  {{if eq .Values.env "prod"}}\r
+        #  claimName: {{ .Values.pvc.prod | quote }}\r
+        #  {{ else }}\r
+        #  claimName: {{ .Values.pvc.dev | quote }}\r
+        #  {{ end }}\r
       {{end}}\r
       containers:\r
       - name: {{ .Values.appName}}\r
@@ -54,7 +58,7 @@ spec:
         ports:\r
         - name: http\r
           containerPort: 5000\r
-          nodePort: {{.Values.nodePort}}\r
+          #nodePort: {{.Values.nodePort}}\r
           protocol: TCP\r
         {{ if eq .Values.env "st"}}\r
         resources:\r
@@ -81,8 +85,8 @@ spec:
         - name: APP_VERSION\r
           value: {{.Values.version}}\r
         volumeMounts:\r
-        - name: {{.Values.appName}}-cert-volume\r
-          mountPath: /opt/cert\r
+#        - name: {{.Values.appName}}-cert-volume\r
+#          mountPath: /opt/cert\r
         {{ if or (eq .Values.env "st") (eq .Values.env "prod-dr")}}\r
         {{else}}\r
         - name: logging-pvc\r
@@ -92,7 +96,7 @@ spec:
           httpGet:\r
             path: {{.Values.health}}\r
             port: http\r
-            scheme: HTTPS\r
+            scheme: HTTP\r
             httpHeaders:\r
               - name: X-Custom-Header\r
                 value: Alive\r
@@ -103,7 +107,7 @@ spec:
           httpGet:\r
             path: {{.Values.health}}\r
             port: http\r
-            scheme: HTTPS\r
+            scheme: HTTP\r
             httpHeaders:\r
               - name: X-Custom-Header\r
                 value: Ready\r