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-frontend / helm / otf-frontend / templates / deployment.yaml
diff --git a/otf-frontend/helm/otf-frontend/templates/deployment.yaml b/otf-frontend/helm/otf-frontend/templates/deployment.yaml
index 4d6c3e8..70cbeb5 100644 (file)
--- a/otf-frontend/helm/otf-frontend/templates/deployment.yaml
+++ b/otf-frontend/helm/otf-frontend/templates/deployment.yaml
@@ -9,12 +9,12 @@ metadata:
 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
+  # 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
@@ -32,6 +32,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
@@ -48,27 +52,28 @@ spec:
         image: {{ .Values.image}}\r
         imagePullPolicy: Always\r
         ports:\r
-        - name: https\r
-          containerPort: 443\r
-          nodePort: {{.Values.nodePort}}\r
+        - name: http\r
+          containerPort: 80\r
+\r
+          # nodePort: {{.Values.nodePort}}\r
           protocol: TCP\r
-        {{ if eq .Values.env "st"}}\r
-        resources:\r
-          limits:\r
-            memory: "5Gi"\r
-            cpu: "3"\r
-          requests:\r
-            memory: "2Gi"\r
-            cpu: "1"\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: "5Gi"\r
+        #     cpu: "3"\r
+        #   requests:\r
+        #     memory: "2Gi"\r
+        #     cpu: "1"\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
@@ -155,49 +160,66 @@ spec:
               key: aaf_mech_password\r
               optional: true\r
         - name: MONGO_BASEURL\r
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.mongo.prod.MONGO_BASEURL | quote}}\r
-          {{ else if eq .Values.env "st" }}\r
-          value: {{ .Values.mongo.st.MONGO_BASEURL | quote}}\r
-          {{ else }}\r
-          value: {{ .Values.mongo.dev.MONGO_BASEURL | 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.MONGO_BASEURL | quote}}\r
+        #   {{ else if eq .Values.env "st" }}\r
+        #   value: {{ .Values.mongo.st.MONGO_BASEURL | quote}}\r
+        #   {{ else }}\r
+        #   value: {{ .Values.mongo.dev.MONGO_BASEURL | quote}}\r
+        #   {{ end }}\r
         - name: MONGO_DBOTF\r
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.mongo.prod.MONGO_DBOTF | quote }}\r
-          {{ else if eq .Values.env "st" }}\r
-          value: {{ .Values.mongo.st.MONGO_DBOTF | quote }}\r
-          {{ else }}\r
-          value: {{ .Values.mongo.dev.MONGO_DBOTF | 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.mongo.prod.MONGO_DBOTF | quote }}\r
+          # {{ else if eq .Values.env "st" }}\r
+          # value: {{ .Values.mongo.st.MONGO_DBOTF | quote }}\r
+          # {{ else }}\r
+          # value: {{ .Values.mongo.dev.MONGO_DBOTF | quote }}\r
+          # {{ end }}\r
         - name: MONGO_REPLICASET\r
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}\r
-          value: {{ .Values.mongo.prod.MONGO_REPLICASET | quote }}\r
-          {{ else if eq .Values.env "st" }}\r
-          value: {{ .Values.mongo.st.MONGO_REPLICASET | quote }}\r
-          {{ else }}\r
-          value: {{ .Values.mongo.dev.MONGO_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.mongo.prod.MONGO_REPLICASET | quote }}\r
+          # {{ else if eq .Values.env "st" }}\r
+          # value: {{ .Values.mongo.st.MONGO_REPLICASET | quote }}\r
+          # {{ else }}\r
+          # value: {{ .Values.mongo.dev.MONGO_REPLICASET | quote }}\r
+          # {{ end }}\r
         - name: 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: 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
         volumeMounts:\r
         - name: {{.Values.appName}}-cert-volume\r
           mountPath: /home/node/server/config/cert/\r
         livenessProbe:\r
           httpGet:\r
             path: {{ .Values.healthEndpoint }}\r
-            port: https\r
-            scheme: HTTPS\r
+            port: 80\r
+            scheme: HTTP\r
             httpHeaders:\r
               - name: X-Custom-Header\r
                 value: Alive\r
@@ -207,8 +229,8 @@ spec:
         readinessProbe:\r
           httpGet:\r
             path: {{ .Values.healthEndpoint }}\r
-            port: https\r
-            scheme: HTTPS\r
+            port: 80\r
+            scheme: HTTP\r
             httpHeaders:\r
               - name: X-Custom-Header\r
                 value: Ready\r