-apiVersion: extensions/v1beta1\r
+apiVersion: apps/v1\r
kind: Deployment\r
metadata:\r
name: {{ .Values.appName}}\r
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
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
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
value: {{.Values.serviceApi.dev.SERVICEAPI_URIEXECUTETESTINSTANCE | quote}}\r
{{ end }}\r
- name: SERVICEAPI_AAFID\r
- valueFrom:\r
- secretKeyRef:\r
- name: {{ .Values.sharedSecret}}\r
- key: aaf_id\r
- optional: true\r
+ value: {{.Values.one_click.mechId}}\r
+# valueFrom:\r
+# secretKeyRef:\r
+# name: {{ .Values.sharedSecret}}\r
+# key: aaf_id\r
+# optional: true\r
- name: SERVICEAPI_AAFPASSWORD\r
- valueFrom:\r
- secretKeyRef:\r
- name: {{ .Values.sharedSecret}}\r
- key: aaf_mech_password\r
- optional: true\r
+ value: {{.Values.one_click.mechIdPassword}}\r
+# valueFrom:\r
+# secretKeyRef:\r
+# name: {{ .Values.sharedSecret}}\r
+# key: aaf_mech_password\r
+# optional: true\r
- name: CAMUNDAAPI_URL\r
{{ if eq .Values.env "prod" }}\r
value: {{ .Values.camundaApi.prod.CAMUNDAAPI_URL | quote}}\r
value: {{ .Values.camundaApi.dev.CAMUNDAAPI_URL | quote}}\r
{{ end }}\r
- name: CAMUNDAAPI_AAFID\r
- valueFrom:\r
- secretKeyRef:\r
- name: {{ .Values.sharedSecret}}\r
- key: aaf_id\r
- optional: true\r
+ value: {{.Values.one_click.mechId}}\r
+# valueFrom:\r
+# secretKeyRef:\r
+# name: {{ .Values.sharedSecret}}\r
+# key: aaf_id\r
+# optional: true\r
- name: CAMUNDAAPI_AAFPASSWORD\r
- valueFrom:\r
- secretKeyRef:\r
- name: {{ .Values.sharedSecret}}\r
- key: aaf_mech_password\r
- optional: true\r
+ value: {{.Values.one_click.mechIdPassword}}\r
+# valueFrom:\r
+# secretKeyRef:\r
+# name: {{ .Values.sharedSecret}}\r
+# 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
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
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