X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=otf-frontend%2Fhelm%2Fotf-frontend%2Ftemplates%2Fdeployment.yaml;h=4a672d9b6a5bad958535509d737a69cec2028e88;hb=511121c6c7d682288fd3fc72666db8f2221b72ae;hp=4d6c3e86eef14ab07c0794bfa3b14d263f55bdfe;hpb=6f7e46b4562b31f748670be8947d315963240ddd;p=it%2Fotf.git

diff --git a/otf-frontend/helm/otf-frontend/templates/deployment.yaml b/otf-frontend/helm/otf-frontend/templates/deployment.yaml
index 4d6c3e8..4a672d9 100644
--- a/otf-frontend/helm/otf-frontend/templates/deployment.yaml
+++ b/otf-frontend/helm/otf-frontend/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.appName}}
@@ -9,12 +9,12 @@ metadata:
 spec:
   revisionHistoryLimit: 1   # keep one replica set to allow rollback
   minReadySeconds: 10
-  strategy:
-    # indicate which strategy we want for rolling update
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
+  # strategy:
+  #   # indicate which strategy we want for rolling update
+  #   type: RollingUpdate
+  #   rollingUpdate:
+  #     maxSurge: 1
+  #     maxUnavailable: 1
   {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
   replicas: {{ .Values.replicas.prod}}
   {{ else if  eq .Values.env "st"}}
@@ -32,6 +32,10 @@ spec:
         app: {{ .Values.appName}}
         version: {{.Values.version}}
     spec:
+      {{ if .Values.pullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.pullSecret }}
+      {{ end }}
       serviceAccount: default
       volumes:
       - name: {{ .Values.appName}}-cert-volume
@@ -48,27 +52,28 @@ spec:
         image: {{ .Values.image}}
         imagePullPolicy: Always
         ports:
-        - name: https
-          containerPort: 443
-          nodePort: {{.Values.nodePort}}
+        - name: http
+          containerPort: 80
+
+          # nodePort: {{.Values.nodePort}}
           protocol: TCP
-        {{ if eq .Values.env "st"}}
-        resources:
-          limits:
-            memory: "5Gi"
-            cpu: "3"
-          requests:
-            memory: "2Gi"
-            cpu: "1"
-        {{else}}
-        resources:
-          limits:
-            memory: "10Gi"
-            cpu: "6"
-          requests:
-            memory: "4Gi"
-            cpu: "2"
-        {{end}}
+        # {{ if eq .Values.env "st"}}
+        # resources:
+        #   limits:
+        #     memory: "5Gi"
+        #     cpu: "3"
+        #   requests:
+        #     memory: "2Gi"
+        #     cpu: "1"
+        # {{else}}
+        # resources:
+        #   limits:
+        #     memory: "10Gi"
+        #     cpu: "6"
+        #   requests:
+        #     memory: "4Gi"
+        #     cpu: "2"
+        # {{end}}
         env:
         - name: ENV
           {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
@@ -121,17 +126,19 @@ spec:
           value: {{.Values.serviceApi.dev.SERVICEAPI_URIEXECUTETESTINSTANCE | quote}}
           {{ end }}
         - name: SERVICEAPI_AAFID
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.sharedSecret}}
-              key: aaf_id
-              optional: true
+          value: {{.Values.one_click.mechId}}
+#          valueFrom:
+#            secretKeyRef:
+#              name: {{ .Values.sharedSecret}}
+#              key: aaf_id
+#              optional: true
         - name: SERVICEAPI_AAFPASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.sharedSecret}}
-              key: aaf_mech_password
-              optional: true
+          value: {{.Values.one_click.mechIdPassword}}
+#          valueFrom:
+#            secretKeyRef:
+#              name: {{ .Values.sharedSecret}}
+#              key: aaf_mech_password
+#              optional: true
         - name: CAMUNDAAPI_URL
           {{ if eq .Values.env "prod" }}
           value: {{ .Values.camundaApi.prod.CAMUNDAAPI_URL | quote}}
@@ -143,61 +150,78 @@ spec:
           value: {{ .Values.camundaApi.dev.CAMUNDAAPI_URL | quote}}
           {{ end }}
         - name: CAMUNDAAPI_AAFID
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.sharedSecret}}
-              key: aaf_id
-              optional: true
+          value: {{.Values.one_click.mechId}}
+#          valueFrom:
+#            secretKeyRef:
+#              name: {{ .Values.sharedSecret}}
+#              key: aaf_id
+#              optional: true
         - name: CAMUNDAAPI_AAFPASSWORD
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.sharedSecret}}
-              key: aaf_mech_password
-              optional: true
+          value: {{.Values.one_click.mechIdPassword}}
+#          valueFrom:
+#            secretKeyRef:
+#              name: {{ .Values.sharedSecret}}
+#              key: aaf_mech_password
+#              optional: true
         - name: MONGO_BASEURL
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
-          value: {{ .Values.mongo.prod.MONGO_BASEURL | quote}}
-          {{ else if eq .Values.env "st" }}
-          value: {{ .Values.mongo.st.MONGO_BASEURL | quote}}
-          {{ else }}
-          value: {{ .Values.mongo.dev.MONGO_BASEURL | quote}}
-          {{ end }}
+          value: {{ .Values.one_click.mongo.ip | quote }}
+        #   {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
+        #   value: {{ .Values.mongo.prod.MONGO_BASEURL | quote}}
+        #   {{ else if eq .Values.env "st" }}
+        #   value: {{ .Values.mongo.st.MONGO_BASEURL | quote}}
+        #   {{ else }}
+        #   value: {{ .Values.mongo.dev.MONGO_BASEURL | quote}}
+        #   {{ end }}
         - name: MONGO_DBOTF
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
-          value: {{ .Values.mongo.prod.MONGO_DBOTF | quote }}
-          {{ else if eq .Values.env "st" }}
-          value: {{ .Values.mongo.st.MONGO_DBOTF | quote }}
-          {{ else }}
-          value: {{ .Values.mongo.dev.MONGO_DBOTF | quote }}
-          {{ end }}
+          # value: {{ .Values.one_click.mongo.database | quote }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.one_click.mongo.secret_name}}
+              key: mongodb-database
+              optional: false
+          # {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
+          # value: {{ .Values.mongo.prod.MONGO_DBOTF | quote }}
+          # {{ else if eq .Values.env "st" }}
+          # value: {{ .Values.mongo.st.MONGO_DBOTF | quote }}
+          # {{ else }}
+          # value: {{ .Values.mongo.dev.MONGO_DBOTF | quote }}
+          # {{ end }}
         - name: MONGO_REPLICASET
-          {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
-          value: {{ .Values.mongo.prod.MONGO_REPLICASET | quote }}
-          {{ else if eq .Values.env "st" }}
-          value: {{ .Values.mongo.st.MONGO_REPLICASET | quote }}
-          {{ else }}
-          value: {{ .Values.mongo.dev.MONGO_REPLICASET | quote }}
-          {{ end }}
+          # value: {{ .Values.one_click.mongo.replicaset | quote }}
+          valueFrom:
+            secretKeyRef:
+              name: {{ .Values.one_click.mongo.secret_name}}
+              key: mongodb-replicaSet
+              optional: false
+          # {{ if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
+          # value: {{ .Values.mongo.prod.MONGO_REPLICASET | quote }}
+          # {{ else if eq .Values.env "st" }}
+          # value: {{ .Values.mongo.st.MONGO_REPLICASET | quote }}
+          # {{ else }}
+          # value: {{ .Values.mongo.dev.MONGO_REPLICASET | quote }}
+          # {{ end }}
         - name: MONGO_USERNAME
+          #value: root
+          #value: otfuser
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.appName}}
-              key: mongo_username
-              optional: true
+              name: {{ .Values.one_click.mongo.secret_name}}
+              key: mongodb-username
+              optional: false
         - name: MONGO_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.appName}}
-              key: mongo_password
-              optional: true
+              name: {{ .Values.one_click.mongo.secret_name}}
+              key: mongodb-password
+              optional: false
         volumeMounts:
         - name: {{.Values.appName}}-cert-volume
           mountPath: /home/node/server/config/cert/
         livenessProbe:
           httpGet:
             path: {{ .Values.healthEndpoint }}
-            port: https
-            scheme: HTTPS
+            port: 80
+            scheme: HTTP
             httpHeaders:
               - name: X-Custom-Header
                 value: Alive
@@ -207,8 +231,8 @@ spec:
         readinessProbe:
           httpGet:
             path: {{ .Values.healthEndpoint }}
-            port: https
-            scheme: HTTPS
+            port: 80
+            scheme: HTTP
             httpHeaders:
               - name: X-Custom-Header
                 value: Ready