diff --git a/tools/openshift/backend.dc.yaml b/tools/openshift/backend.dc.yaml index f0d0d77b..f04a79a9 100644 --- a/tools/openshift/backend.dc.yaml +++ b/tools/openshift/backend.dc.yaml @@ -123,9 +123,9 @@ objects: path: /api port: targetPort: 8080-tcp - # tls: - # insecureEdgeTerminationPolicy: Redirect - # termination: edge + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect to: kind: Service name: '${APP_NAME}-backend' diff --git a/tools/openshift/frontend.dc.yaml b/tools/openshift/frontend.dc.yaml index 57cd68f0..5bee2924 100644 --- a/tools/openshift/frontend.dc.yaml +++ b/tools/openshift/frontend.dc.yaml @@ -36,12 +36,12 @@ objects: containers: - image: image-registry.openshift-image-registry.svc:5000/${NAMESPACE}/${REPO_NAME}-frontend-${BRANCH}:${TAG} imagePullPolicy: Always - # volumeMounts: - # - name: tls-certs - # mountPath: '/etc/tls-certs' - # readOnly: true - # - name: config-env - # mountPath: '/srv/js/config' + volumeMounts: + # - name: tls-certs + # mountPath: '/etc/tls-certs' + # readOnly: true + - name: config-env + mountPath: '/srv/js/config' livenessProbe: failureThreshold: 3 httpGet: @@ -71,13 +71,13 @@ objects: limits: cpu: '${MAX_CPU}' memory: '${MAX_MEM}' - # volumes: - # - name: tls-certs - # secret: - # secretName: ofm-frontend-cert - # - name: config-env - # configMap: - # name: ofm-frontend-config-map + volumes: + # - name: tls-certs + # secret: + # secretName: ofm-frontend-cert + - name: config-env + configMap: + name: ofm-frontend-config-map test: false triggers: - type: ConfigChange @@ -115,6 +115,9 @@ objects: weight: 100 port: targetPort: 2015-tcp + tls: + termination: edge + insecureEdgeTerminationPolicy: Redirect wildcardPolicy: None - apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler @@ -180,4 +183,4 @@ parameters: required: false - name: PRIVATE_KEY description: The private key - required: false \ No newline at end of file + required: false