X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fotf.git;a=blobdiff_plain;f=otf-service-api%2Fhelm%2Fotf-service-api%2Ftemplates%2Fdeployment.yaml;fp=otf-service-api%2Fhelm%2Fotf-service-api%2Ftemplates%2Fdeployment.yaml;h=819085c698c6ffb0f1540a915c4e0de87d56777e;hp=3a406d3898548b938b5f8b4aadffafb9e14c9f51;hb=8ef0d4aed95ebd3b992d48fe89f0ce80b6a0b0c6;hpb=f035d8413fbe22f0a2157e11946e794c99fe5159

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
--- 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}}
     version: {{.Values.version}}
 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
   {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
   replicas: {{ .Values.replicas.prod}}
   {{ else if  eq .Values.env "st"}}
@@ -24,19 +32,23 @@ spec:
         app: {{ .Values.appName}}
         version: {{.Values.version}}
     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
+      # 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
+      {{ if .Values.pullSecret }}
+      imagePullSecrets:
+        - name: {{ .Values.pullSecret }}
+      {{ end }}
       serviceAccount: default
       volumes:
-      - name: {{ .Values.appName}}-aaf-volume
-        secret:
-          secretName: {{.Values.sharedSecret}}
+#      - name: {{ .Values.appName}}-aaf-volume
+#        secret:
+#          secretName: {{.Values.sharedSecret}}
       - name: {{ .Values.appName}}-keyfile-volume
         secret:
           secretName: {{.Values.sharedSecret}}
@@ -59,13 +71,13 @@ spec:
             {{ end }}          
       {{ if or (eq .Values.env "st") (eq .Values.env "prod-dr")}}
       {{else}}
-      - name: logging-pvc
-        persistentVolumeClaim:
-          {{if eq .Values.env "prod"}}
-          claimName: {{ .Values.pvc.prod | quote }}
-          {{ else }}
-          claimName: {{ .Values.pvc.dev | quote }}
-          {{ end }}
+#      - name: logging-pvc
+#        persistentVolumeClaim:
+#          {{if eq .Values.env "prod"}}
+#          claimName: {{ .Values.pvc.prod | quote }}
+#          {{ else }}
+#          claimName: {{ .Values.pvc.dev | quote }}
+#          {{ end }}
       {{end}}
       containers:
       - name: {{ .Values.appName}}
@@ -74,25 +86,25 @@ spec:
         ports:
         - name: https
           containerPort: 8443
-          nodePort: {{.Values.nodePort}}
+          # nodePort: {{.Values.nodePort}}
           protocol: TCP
-        {{ if eq .Values.env "st"}}
-        resources:
-          limits: 
-            memory: "3Gi"
-            cpu: "1.8"
-          requests:
-            memory: "2Gi"
-            cpu: "1"
-        {{else}}  
-        resources:
-          limits:
-            memory: "6Gi"
-            cpu: "4"
-          requests:
-            memory: "2Gi"
-            cpu: "1.5"
-        {{ end }}
+       # {{ if eq .Values.env "st"}}
+       # resources:
+       #   limits: 
+       #     memory: "3Gi"
+       #     cpu: "1.8"
+       #   requests:
+       #     memory: "2Gi"
+       #     cpu: "1"
+       # {{else}}  
+       # resources:
+       #   limits:
+       #     memory: "6Gi"
+       #     cpu: "4"
+       #   requests:
+       #     memory: "2Gi"
+       #     cpu: "1.5"
+       # {{ end }}
         env:
         - name: NAMESPACE
           value: {{.Values.namespace}}
@@ -124,12 +136,12 @@ spec:
               name: {{ .Values.sharedSecret}}
               key: aaf_password
               optional: true
-        - name: CADI_KEYFILE
-          valueFrom:
-            secretKeyRef:
-              name: {{ .Values.sharedSecret}}
-              key: keyfile_secret_path
-              optional: true
+        # - name: CADI_KEYFILE
+        #   valueFrom:
+        #     secretKeyRef:
+        #       name: {{ .Values.sharedSecret}}
+        #       key: keyfile_secret_path
+        #       optional: true
         - name: CADI_HOSTNAME
           {{if eq .Values.env "prod"}}
           value: {{ .Values.cadiHostname.prod | quote }}
@@ -143,41 +155,63 @@ spec:
         - name: APP_VERSION
           value: {{.Values.version}}
         - name: OTF_MONGO_HOSTS
-          {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
-          value: {{ .Values.otf.mongo.prod.host | quote }}
-          {{ else if eq  .Values.env "st" }}
-          value: {{ .Values.otf.mongo.st.host | quote }}
-          {{ else }}
-          value: {{ .Values.otf.mongo.dev.host | quote }}
-          {{ end }}
+          value: {{ .Values.one_click.mongo.ip | quote }}
+          #valueFrom:
+          #  secretKeyRef:
+          #    name: {{ .Values.one_click.mongo_secret_name}}
+          #    key: mongodb_ip
+          #    optional: false
+          #{{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
+          #value: {{ .Values.otf.mongo.prod.host | quote }}
+          #{{ else if eq  .Values.env "st" }}
+          #value: {{ .Values.otf.mongo.st.host | quote }}
+          #{{ else }}
+          #value: {{ .Values.otf.mongo.dev.host | quote }}
+          #{{ end }}
         - name: OTF_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: OTF_MONGO_PASSWORD
+          #value: otf.123
+          #value: Today.123
           valueFrom:
             secretKeyRef:
-              name: {{ .Values.appName}}
-              key: mongo_password
-              optional: true
+              name: {{ .Values.one_click.mongo.secret_name}}
+              key: mongodb-password
+              optional: false
         - name: OTF_MONGO_REPLICASET
-          {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
-          value: {{ .Values.otf.mongo.prod.replicaSet | quote }}
-          {{else if  eq .Values.env "st"}}
-          value: {{ .Values.otf.mongo.st.replicaSet | quote }}
-          {{ else }}
-          value: {{ .Values.otf.mongo.dev.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.otf.mongo.prod.replicaSet | quote }}
+          #{{else if  eq .Values.env "st"}}
+          #value: {{ .Values.otf.mongo.st.replicaSet | quote }}
+          #{{ else }}
+          #value: {{ .Values.otf.mongo.dev.replicaSet | quote }}
+          #{{ end }}
         - name: OTF_MONGO_DATABASE
-          {{if or (eq .Values.env "prod") (eq .Values.env "prod-dr")}}
-          value: {{ .Values.otf.mongo.prod.database | quote }}
-          {{else if  eq .Values.env "st"}}
-          value: {{ .Values.otf.mongo.st.database | quote }}
-          {{ else }}
-          value: {{ .Values.otf.mongo.dev.database | 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.otf.mongo.prod.database | quote }}
+          #{{else if  eq .Values.env "st"}}
+          #value: {{ .Values.otf.mongo.st.database | quote }}
+          #{{ else }}
+          #value: {{ .Values.otf.mongo.dev.database | quote }}
+          #{{ end }}
         - name: otf.camunda.host
           {{if eq .Values.env "prod"}}
           value: {{ .Values.otf.camunda.prod.host | quote }}
@@ -238,7 +272,7 @@ spec:
           value: {{ .Values.cert.st.path | quote }}
           {{ else }}
           value: {{ .Values.cert.dev.path | quote }}
-          {{ end }}  
+          {{ end }}
         - name: OTF_CERT_PASS
           valueFrom:
             secretKeyRef:
@@ -246,20 +280,20 @@ spec:
               key: PKCS12_KEY
               optional: true   
         volumeMounts:
-        - name: {{.Values.appName}}-keyfile-volume
-          mountPath: /opt/secret
-        - name: {{.Values.appName}}-cert-volume
-          mountPath: /opt/cert
+        # - name: {{.Values.appName}}-keyfile-volume
+        #   mountPath: /opt/secret
+        # - name: {{.Values.appName}}-cert-volume
+        #   mountPath: /opt/cert
         {{ if or (eq .Values.env "st") (eq .Values.env "prod-dr")}}
         {{else}}
-        - name: logging-pvc
-          mountPath: "/otf/logs"
+        # - name: logging-pvc
+        #   mountPath: "/otf/logs"
         {{end}} 
         livenessProbe:
           httpGet:
             path: /otf/api/health/v1
             port: https
-            scheme: HTTPS
+            scheme: HTTP
             httpHeaders:
             - name: X-Custom-Header
               value: Alive
@@ -270,7 +304,7 @@ spec:
           httpGet:
             path: /otf/api/health/v1
             port: https
-            scheme: HTTPS
+            scheme: HTTP
             httpHeaders:
             - name: X-Custom-Header
               value: Ready