X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fotf.git;a=blobdiff_plain;f=otf-camunda%2Fhelm%2Fotf-camunda%2Ftemplates%2Fdeployment.yaml;fp=otf-camunda%2Fhelm%2Fotf-camunda%2Ftemplates%2Fdeployment.yaml;h=c2deb266e3275043bcc8612daf0d0a411b2062ad;hp=89f751ea7ec4caa6b2d0cc15e42ed082107d4045;hb=321c6b595a3f05db9e4327c16af85c16752f9ec2;hpb=29cd8447ada8036b91ad2ca75a3c1c3fe0d8ba55

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