Code Review / it / otf.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
updating helm/docker files and database config files
[it/otf.git] / otf-camunda / helm / otf-camunda / templates / deployment.yaml
diff --git a/otf-camunda/helm/otf-camunda/templates/deployment.yaml b/otf-camunda/helm/otf-camunda/templates/deployment.yaml
index 89f751e..c2deb26 100644 (file)
--- a/otf-camunda/helm/otf-camunda/templates/deployment.yaml
+++ b/otf-camunda/helm/otf-camunda/templates/deployment.yaml
@@ -8,13 +8,15 @@ metadata:
     version: {{.Values.version}}\r
 spec:\r
   revisionHistoryLimit: 1\r
-  minReadySeconds: 10\r
-  strategy:\r
+  #minReadySeconds: 10\r
+  #strategy:\r
   # indicate which strategy we want for rolling update\r
-    type: RollingUpdate\r
-    rollingUpdate:\r
-      maxSurge: 3\r
-      maxUnavailable: 1\r
+  #  type: RollingUpdate\r
+  #  rollingUpdate:\r
+  #    maxSurge: 3\r
+  #    maxUnavailable: 1\r
+  #serviceName: camundaServiceName\r
+  serviceName: camunda-service-name\r
   replicas: {{ .Values.replicas}}\r
   selector:\r
     matchLabels:\r
@@ -26,11 +28,16 @@ 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}}-aaf-volume\r
         secret:\r
           secretName: {{.Values.sharedSecret}}\r
+          optional: true\r
       - name: {{ .Values.appName}}-keyfile-volume\r
         secret:\r
           secretName: {{.Values.sharedSecret}}\r
@@ -53,80 +60,80 @@ spec:
             {{ end }}\r
           - key: private_key\r
             path: {{ .Values.Secret.privateKey.name }}\r
-      - name: {{.Values.appName}}-config-volume\r
-        configMap:\r
-          name: {{.Values.appName}}-config\r
-          items:\r
-          - key: router_config\r
-            path: config.ini\r
+#      - name: {{.Values.appName}}-config-volume\r
+#        configMap:\r
+#          name: {{.Values.appName}}-config\r
+#          items:\r
+#          - key: router_config\r
+#            path: config.ini\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: mysql-router\r
-        image: {{ .Values.otf.camunda.router.image }}\r
-        imagePullPolicy: Always\r
-        ports:\r
-        - name: http\r
-          containerPort: {{ .Values.otf.camunda.router.port }}\r
-          protocol: TCP\r
-        {{ if eq .Values.env "st"}}\r
-        resources:\r
-          limits:\r
-            memory: "1Gi"\r
-            cpu: "500m"\r
-          requests:\r
-            memory: "512Mi"\r
-            cpu: "100m"\r
-        {{else}}\r
-        resources:\r
-          limits:\r
-            memory: "4Gi"\r
-            cpu: "2"\r
-          requests:\r
-            memory: "2Gi"\r
-            cpu: "1"\r
-        {{end}}\r
-        args: ["--config=/opt/config/config.ini"]\r
-        lifecycle:\r
-          preStop:\r
-            exec:\r
-              command: ["/bin/sh", "-c", {{ "sleep 0" | replace "0" (.Values.terminationGracePeriodSeconds | toString) | quote}} ]\r
-        volumeMounts:\r
-        - name: {{.Values.appName}}-config-volume\r
-          mountPath: /opt/config\r
+#      - name: mysql-router\r
+#        image: {{ .Values.otf.camunda.router.image }}\r
+#        imagePullPolicy: Always\r
+#        ports:\r
+#        - name: http\r
+#          containerPort: {{ .Values.otf.camunda.router.port }}\r
+#          protocol: TCP\r
+        #{{ if eq .Values.env "st"}}\r
+        #resources:\r
+        #  limits:\r
+        #    memory: "1Gi"\r
+        #    cpu: "500m"\r
+        #  requests:\r
+        #    memory: "512Mi"\r
+        #    cpu: "100m"\r
+        #{{else}}\r
+        #resources:\r
+        #  limits:\r
+        #    memory: "1Gi"\r
+        #    cpu: "500m"\r
+        #  requests:\r
+        #    memory: "512Mi"\r
+        #    cpu: "100m"\r
+        #{{end}}\r
+#        args: ["--config=/opt/config/config.ini"]\r
+#        lifecycle:\r
+#          preStop:\r
+#            exec:\r
+#              command: ["/bin/sh", "-c", {{ "sleep 0" | replace "0" (.Values.terminationGracePeriodSeconds | toString) | quote}} ]\r
+        #volumeMounts:\r
+        #- name: {{.Values.appName}}-config-volume\r
+        #  mountPath: /opt/config\r
       - name: {{ .Values.appName}}\r
         image: {{ .Values.image}}\r
         imagePullPolicy: Always\r
         ports:\r
         - name: http\r
           containerPort: {{ .Values.otf.camunda.tcu.port }}\r
-          nodePort: {{.Values.nodePort}}\r
+          #nodePort: {{.Values.nodePort}}\r
           protocol: TCP\r
-        {{ if eq .Values.env "st"}}\r
-        resources:\r
-          limits:\r
-            memory: "6Gi"\r
-            cpu: "2.8"\r
-          requests:\r
-            memory: "2Gi"\r
-            cpu: "1.5"\r
-        {{else}}\r
-        resources:\r
-          limits:\r
-            memory: "10Gi"\r
-            cpu: "6"\r
-          requests:\r
-            memory: "4Gi"\r
-            cpu: "2"\r
-        {{end}}\r
+        #{{ if eq .Values.env "st"}}\r
+        #resources:\r
+        #  limits:\r
+        #    memory: "6Gi"\r
+        #    cpu: "2.8"\r
+        #  requests:\r
+        #    memory: "2Gi"\r
+        #    cpu: "1.5"\r
+        #{{else}}\r
+        #resources:\r
+        #  limits:\r
+        #    memory: "10Gi"\r
+        #    cpu: "6"\r
+        #  requests:\r
+        #    memory: "4Gi"\r
+        #    cpu: "2"\r
+        #{{end}}\r
         env:\r
         - name: ENV\r
           {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
@@ -153,59 +160,95 @@ spec:
         - 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
           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: 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
+          # {{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_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_DB_URL\r
-          {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.otf.camunda.db.prod.url}}\r
-          {{else if  eq .Values.env "st"}}\r
-          value: {{ .Values.otf.camunda.db.st.url}}\r
-          {{ else }}\r
-          value: {{ .Values.otf.camunda.db.dev.url}}\r
-          {{ end }}\r
+          #{{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
+          #value: {{ .Values.otf.camunda.db.prod.url}}\r
+          #{{else if  eq .Values.env "st"}}\r
+          #value: {{ .Values.otf.camunda.db.st.url}}\r
+          #{{ else }}\r
+          #value: {{ .Values.otf.camunda.db.dev.url}}\r
+          #{{ end }}\r
+          value: {{ .Values.one_click.mysql.ip | quote }}\r
         - name: OTF_CAMUNDA_DB_USERNAME\r
+          #value: {{ .Values.otf.camunda.db.username}}\r
           valueFrom:\r
             secretKeyRef:\r
-              name: {{ .Values.appName}}\r
-              key: camunda_db_username\r
-              optional: true\r
+              name: {{ .Values.one_click.mysql.secret_name}}\r
+              key: mysql-username\r
+              optional: false\r
+          #valueFrom:\r
+          #  secretKeyRef:\r
+          #    name: {{ .Values.appName}}\r
+          #    key: camunda_db_username\r
+          #    optional: true\r
         - name: OTF_CAMUNDA_DB_PASSWORD\r
+          #value: {{ .Values.otf.camunda.db.password}}\r
           valueFrom:\r
             secretKeyRef:\r
-              name: {{ .Values.appName}}\r
-              key: camunda_db_password\r
-              optional: true\r
+              name: {{ .Values.one_click.mysql.secret_name}}\r
+              key: mysql-password\r
+              optional: false\r
+          #valueFrom:\r
+          #  secretKeyRef:\r
+          #    name: {{ .Values.appName}}\r
+          #    key: camunda_db_password\r
+          #    optional: true\r
         - name: AAF_PERM_TYPE\r
           {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
           value: {{ .Values.aafPermType.prod | quote }}\r
@@ -285,14 +328,14 @@ spec:
           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/health/v1\r
             port: http\r
-            scheme: HTTPS\r
+            scheme: HTTP\r
             httpHeaders:\r
             - name: X-Custom-Header\r
               value: Alive\r
@@ -303,7 +346,7 @@ spec:
           httpGet:\r
             path: /otf/health/v1\r
             port: http\r
-            scheme: HTTPS\r
+            scheme: HTTP\r
             httpHeaders:\r
             - name: X-Custom-Header\r
               value: Ready\r