Code Review / it / otf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
updated docker/helm files for svc,ping,robot,ssh, and o1
[it/otf.git] / otf-service-api / helm / otf-service-api / templates / deployment.yaml
diff --git a/otf-service-api/helm/otf-service-api/templates/deployment.yaml b/otf-service-api/helm/otf-service-api/templates/deployment.yaml
index 3a406d3..819085c 100644 (file)
--- a/otf-service-api/helm/otf-service-api/templates/deployment.yaml
+++ b/otf-service-api/helm/otf-service-api/templates/deployment.yaml
@@ -7,6 +7,14 @@ metadata:
     app: {{ .Values.appName}}\r
     version: {{.Values.version}}\r
 spec:\r
+  revisionHistoryLimit: 1   # keep one replica set to allow rollback\r
+  minReadySeconds: 10\r
+  # strategy:\r
+  #   # indicate which strategy we want for rolling update\r
+  #   type: RollingUpdate\r
+  #   rollingUpdate:\r
+  #     maxSurge: 1\r
+  #     maxUnavailable: 1\r
   {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
   replicas: {{ .Values.replicas.prod}}\r
   {{ else if  eq .Values.env "st"}}\r
@@ -24,19 +32,23 @@ spec:
         app: {{ .Values.appName}}\r
         version: {{.Values.version}}\r
     spec:\r
-      revisionHistoryLimit: 1   # keep one replica set to allow rollback\r
-      minReadySeconds: 10\r
-      strategy:\r
-        # indicate which strategy we want for rolling update\r
-        type: RollingUpdate\r
-        rollingUpdate:\r
-          maxSurge: 1\r
-          maxUnavailable: 1\r
+      # revisionHistoryLimit: 1   # keep one replica set to allow rollback\r
+      # minReadySeconds: 10\r
+      # strategy:\r
+      #   # indicate which strategy we want for rolling update\r
+      #   type: RollingUpdate\r
+      #   rollingUpdate:\r
+      #     maxSurge: 1\r
+      #     maxUnavailable: 1\r
+      {{ if .Values.pullSecret }}\r
+      imagePullSecrets:\r
+        - name: {{ .Values.pullSecret }}\r
+      {{ end }}\r
       serviceAccount: default\r
       volumes:\r
-      - name: {{ .Values.appName}}-aaf-volume\r
-        secret:\r
-          secretName: {{.Values.sharedSecret}}\r
+#      - name: {{ .Values.appName}}-aaf-volume\r
+#        secret:\r
+#          secretName: {{.Values.sharedSecret}}\r
       - name: {{ .Values.appName}}-keyfile-volume\r
         secret:\r
           secretName: {{.Values.sharedSecret}}\r
@@ -59,13 +71,13 @@ spec:
             {{ end }}          \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
+#      - 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
       {{end}}\r
       containers:\r
       - name: {{ .Values.appName}}\r
@@ -74,25 +86,25 @@ spec:
         ports:\r
         - name: https\r
           containerPort: 8443\r
-          nodePort: {{.Values.nodePort}}\r
+          # nodePort: {{.Values.nodePort}}\r
           protocol: TCP\r
-        {{ if eq .Values.env "st"}}\r
-        resources:\r
-          limits: \r
-            memory: "3Gi"\r
-            cpu: "1.8"\r
-          requests:\r
-            memory: "2Gi"\r
-            cpu: "1"\r
-        {{else}}  \r
-        resources:\r
-          limits:\r
-            memory: "6Gi"\r
-            cpu: "4"\r
-          requests:\r
-            memory: "2Gi"\r
-            cpu: "1.5"\r
-        {{ end }}\r
+       # {{ if eq .Values.env "st"}}\r
+       # resources:\r
+       #   limits: \r
+       #     memory: "3Gi"\r
+       #     cpu: "1.8"\r
+       #   requests:\r
+       #     memory: "2Gi"\r
+       #     cpu: "1"\r
+       # {{else}}  \r
+       # resources:\r
+       #   limits:\r
+       #     memory: "6Gi"\r
+       #     cpu: "4"\r
+       #   requests:\r
+       #     memory: "2Gi"\r
+       #     cpu: "1.5"\r
+       # {{ end }}\r
         env:\r
         - name: NAMESPACE\r
           value: {{.Values.namespace}}\r
@@ -124,12 +136,12 @@ spec:
               name: {{ .Values.sharedSecret}}\r
               key: aaf_password\r
               optional: true\r
-        - name: CADI_KEYFILE\r
-          valueFrom:\r
-            secretKeyRef:\r
-              name: {{ .Values.sharedSecret}}\r
-              key: keyfile_secret_path\r
-              optional: true\r
+        # - name: CADI_KEYFILE\r
+        #   valueFrom:\r
+        #     secretKeyRef:\r
+        #       name: {{ .Values.sharedSecret}}\r
+        #       key: keyfile_secret_path\r
+        #       optional: true\r
         - name: CADI_HOSTNAME\r
           {{if eq .Values.env "prod"}}\r
           value: {{ .Values.cadiHostname.prod | quote }}\r
@@ -143,41 +155,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.otf.mongo.prod.host | quote }}\r
-          {{ else if eq  .Values.env "st" }}\r
-          value: {{ .Values.otf.mongo.st.host | quote }}\r
-          {{ else }}\r
-          value: {{ .Values.otf.mongo.dev.host | quote }}\r
-          {{ end }}\r
+          value: {{ .Values.one_click.mongo.ip | quote }}\r
+          #valueFrom:\r
+          #  secretKeyRef:\r
+          #    name: {{ .Values.one_click.mongo_secret_name}}\r
+          #    key: mongodb_ip\r
+          #    optional: false\r
+          #{{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
+          #value: {{ .Values.otf.mongo.prod.host | quote }}\r
+          #{{ else if eq  .Values.env "st" }}\r
+          #value: {{ .Values.otf.mongo.st.host | quote }}\r
+          #{{ else }}\r
+          #value: {{ .Values.otf.mongo.dev.host | quote }}\r
+          #{{ end }}\r
         - name: OTF_MONGO_USERNAME\r
+          #value: root\r
+          #value: otfuser\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
         - name: OTF_MONGO_PASSWORD\r
+          #value: otf.123\r
+          #value: Today.123\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
         - name: OTF_MONGO_REPLICASET\r
-          {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.otf.mongo.prod.replicaSet | quote }}\r
-          {{else if  eq .Values.env "st"}}\r
-          value: {{ .Values.otf.mongo.st.replicaSet | quote }}\r
-          {{ else }}\r
-          value: {{ .Values.otf.mongo.dev.replicaSet | quote }}\r
-          {{ end }}\r
+          # value: {{ .Values.one_click.mongo.replicaset | quote }}\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.otf.mongo.prod.replicaSet | quote }}\r
+          #{{else if  eq .Values.env "st"}}\r
+          #value: {{ .Values.otf.mongo.st.replicaSet | quote }}\r
+          #{{ else }}\r
+          #value: {{ .Values.otf.mongo.dev.replicaSet | quote }}\r
+          #{{ end }}\r
         - name: OTF_MONGO_DATABASE\r
-          {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.otf.mongo.prod.database | quote }}\r
-          {{else if  eq .Values.env "st"}}\r
-          value: {{ .Values.otf.mongo.st.database | quote }}\r
-          {{ else }}\r
-          value: {{ .Values.otf.mongo.dev.database | quote }}\r
-          {{ end }}\r
+          # value: {{ .Values.one_click.mongo.database | quote }}\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.otf.mongo.prod.database | quote }}\r
+          #{{else if  eq .Values.env "st"}}\r
+          #value: {{ .Values.otf.mongo.st.database | quote }}\r
+          #{{ else }}\r
+          #value: {{ .Values.otf.mongo.dev.database | quote }}\r
+          #{{ end }}\r
         - name: otf.camunda.host\r
           {{if eq .Values.env "prod"}}\r
           value: {{ .Values.otf.camunda.prod.host | quote }}\r
@@ -238,7 +272,7 @@ spec:
           value: {{ .Values.cert.st.path | quote }}\r
           {{ else }}\r
           value: {{ .Values.cert.dev.path | quote }}\r
-          {{ end }}  \r
+          {{ end }}\r
         - name: OTF_CERT_PASS\r
           valueFrom:\r
             secretKeyRef:\r
@@ -246,20 +280,20 @@ spec:
               key: PKCS12_KEY\r
               optional: true   \r
         volumeMounts:\r
-        - name: {{.Values.appName}}-keyfile-volume\r
-          mountPath: /opt/secret\r
-        - name: {{.Values.appName}}-cert-volume\r
-          mountPath: /opt/cert\r
+        # - name: {{.Values.appName}}-keyfile-volume\r
+        #   mountPath: /opt/secret\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
-          mountPath: "/otf/logs"\r
+        # - name: logging-pvc\r
+        #   mountPath: "/otf/logs"\r
         {{end}} \r
         livenessProbe:\r
           httpGet:\r
             path: /otf/api/health/v1\r
             port: https\r
-            scheme: HTTPS\r
+            scheme: HTTP\r
             httpHeaders:\r
             - name: X-Custom-Header\r
               value: Alive\r
@@ -270,7 +304,7 @@ spec:
           httpGet:\r
             path: /otf/api/health/v1\r
             port: https\r
-            scheme: HTTPS\r
+            scheme: HTTP\r
             httpHeaders:\r
             - name: X-Custom-Header\r
               value: Ready\r