updated docker/helm files for svc,ping,robot,ssh, and o1

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

diff --git a/otf-robot-test-head/helm/otf-robot-test-head/templates/deployment.yaml b/otf-robot-test-head/helm/otf-robot-test-head/templates/deployment.yaml
index 70d6e4c..d6d372d 100644 (file)
--- a/otf-robot-test-head/helm/otf-robot-test-head/templates/deployment.yaml
+++ b/otf-robot-test-head/helm/otf-robot-test-head/templates/deployment.yaml
@@ -26,6 +26,10 @@ 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
@@ -40,12 +44,12 @@ spec:
       {{ 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
         env:\r
         - name: NAMESPACE\r
@@ -64,41 +68,63 @@ spec:
         - name: APP_VERSION\r
           value: {{.Values.version}}\r
         - name: OTF_MONGO_HOSTS\r
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.mongo.prod.OTF_MONGO_HOSTS | quote}}\r
-          {{ else if eq .Values.env "st" }}\r
-          value: {{ .Values.mongo.st.OTF_MONGO_HOSTS | quote}}\r
-          {{ else }}\r
-          value: {{ .Values.mongo.dev.OTF_MONGO_HOSTS | quote}}\r
-          {{ end }}\r
+          value: {{ .Values.one_click.mongo.ip | quote }}\r
+          # {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
+          # value: {{ .Values.mongo.prod.OTF_MONGO_HOSTS | quote}}\r
+          # {{ else if eq .Values.env "st" }}\r
+          # value: {{ .Values.mongo.st.OTF_MONGO_HOSTS | quote}}\r
+          # {{ else }}\r
+          # value: {{ .Values.mongo.dev.OTF_MONGO_HOSTS | quote}}\r
+          # {{ end }}\r
         - name: OTF_MONGO_DATABASE\r
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.mongo.prod.OTF_MONGO_DBOTF | quote }}\r
-          {{ else if eq .Values.env "st" }}\r
-          value: {{ .Values.mongo.st.OTF_MONGO_DBOTF | quote }}\r
-          {{ else }}\r
-          value: {{ .Values.mongo.dev.OTF_MONGO_DBOTF | quote }}\r
-          {{ end }}\r
+          valueFrom:\r
+            secretKeyRef:\r
+              name: {{ .Values.one_click.mongo.secret_name}}\r
+              key: mongodb-database\r
+              optional: false\r
+          # {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
+          # value: {{ .Values.mongo.prod.OTF_MONGO_DBOTF | quote }}\r
+          # {{ else if eq .Values.env "st" }}\r
+          # value: {{ .Values.mongo.st.OTF_MONGO_DBOTF | quote }}\r
+          # {{ else }}\r
+          # value: {{ .Values.mongo.dev.OTF_MONGO_DBOTF | quote }}\r
+          # {{ end }}\r
         - name: OTF_MONGO_REPLICASET\r
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.mongo.prod.OTF_MONGO_REPLICASET | quote }}\r
-          {{ else if eq .Values.env "st" }}\r
-          value: {{ .Values.mongo.st.OTF_MONGO_REPLICASET | quote }}          \r
-          {{ else }}\r
-          value: {{ .Values.mongo.dev.OTF_MONGO_REPLICASET | quote }}\r
-          {{ end }}\r
+          valueFrom:\r
+            secretKeyRef:\r
+              name: {{ .Values.one_click.mongo.secret_name}}\r
+              key: mongodb-replicaSet\r
+              optional: false\r
+          # {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
+          # value: {{ .Values.mongo.prod.OTF_MONGO_REPLICASET | quote }}\r
+          # {{ else if eq .Values.env "st" }}\r
+          # value: {{ .Values.mongo.st.OTF_MONGO_REPLICASET | quote }}          \r
+          # {{ else }}\r
+          # value: {{ .Values.mongo.dev.OTF_MONGO_REPLICASET | quote }}\r
+          # {{ end }}\r
         - name: OTF_MONGO_USERNAME\r
           valueFrom:\r
             secretKeyRef:\r
-              name: {{ .Values.appName}}\r
-              key: mongo_username\r
-              optional: true\r
+              name: {{ .Values.one_click.mongo.secret_name}}\r
+              key: mongodb-username\r
+              optional: false\r
+          # valueFrom:\r
+          #   secretKeyRef:\r
+          #     name: {{ .Values.appName}}\r
+          #     key: mongo_username\r
+          #     optional: true\r
         - name: OTF_MONGO_PASSWORD\r
+          # value: {{ .Values.mongo.password }}\r
           valueFrom:\r
             secretKeyRef:\r
-              name: {{ .Values.appName}}\r
-              key: mongo_password\r
-              optional: true\r
+              name: {{ .Values.one_click.mongo.secret_name}}\r
+              key: mongodb-password\r
+              optional: false\r
+          # valueFrom:\r
+          #   secretKeyRef:\r
+          #     name: {{ .Values.appName}}\r
+          #     key: mongo_password\r
+          #     optional: true\r
         - name: APP_SETTINGS\r
           value: {{ .Values.robot.APP_SETTINGS | quote }} \r
         {{ if eq .Values.env "st"}}\r
@@ -130,22 +156,24 @@ 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
-          initialDelaySeconds: 30\r
+          initialDelaySeconds: 60\r
+          #30\r
           timeoutSeconds: 30\r
           periodSeconds: 30\r
         readinessProbe:\r
           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
-          initialDelaySeconds: 30\r
+          initialDelaySeconds: 60\r
+          # 30\r
           timeoutSeconds: 30\r
           periodSeconds: 30\r
       restartPolicy: Always\r