From ad2381d77767a5ad29c7d29df953868aeff77145 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 27 Jan 2023 10:21:00 +0100
Subject: [PATCH] OZG-3276 OZG-3318 adjust certificate dnsNames
---
src/main/helm/templates/certificate.yaml | 14 +++++++-------
src/test/helm/certificate_test.yaml | 14 +++++++-------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/helm/templates/certificate.yaml b/src/main/helm/templates/certificate.yaml
index 5e4bf27d..02e60de3 100644
--- a/src/main/helm/templates/certificate.yaml
+++ b/src/main/helm/templates/certificate.yaml
@@ -34,11 +34,11 @@ spec:
kind: Issuer
duration: 8760h0m0s
renewBefore: 720h0m0s
- commonName: "user-manager-svc"
+ commonName: {{ include "app.name" . }}
dnsNames:
- - "*.user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
- - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster.local"
- - "user-manager-svc.{{ include "app.namespace" . }}.svc.cluster"
- - "user-manager-svc.{{ include "app.namespace" . }}.svc"
- - "user-manager-svc.{{ include "app.namespace" . }}"
- - "user-manager-svc"
\ No newline at end of file
+ - "*.{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc.cluster.local"
+ - "{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc.cluster.local"
+ - "{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc.cluster"
+ - "{{ include "app.name" . }}.{{ include "app.namespace" . }}.svc"
+ - "{{ include "app.name" . }}.{{ include "app.namespace" . }}"
+ - "{{ include "app.name" . }}"
\ No newline at end of file
diff --git a/src/test/helm/certificate_test.yaml b/src/test/helm/certificate_test.yaml
index 2c0be827..ac111fb2 100644
--- a/src/test/helm/certificate_test.yaml
+++ b/src/test/helm/certificate_test.yaml
@@ -70,24 +70,24 @@ tests:
asserts:
- equal:
path: spec.commonName
- value: "user-manager-svc"
+ value: "user-manager"
- it: should have dnsNames
asserts:
- equal:
path: spec.dnsNames[0]
- value: "*.user-manager-svc.sh-helm-test.svc.cluster.local"
+ value: "*.user-manager.sh-helm-test.svc.cluster.local"
- equal:
path: spec.dnsNames[1]
- value: "user-manager-svc.sh-helm-test.svc.cluster.local"
+ value: "user-manager.sh-helm-test.svc.cluster.local"
- equal:
path: spec.dnsNames[2]
- value: "user-manager-svc.sh-helm-test.svc.cluster"
+ value: "user-manager.sh-helm-test.svc.cluster"
- equal:
path: spec.dnsNames[3]
- value: "user-manager-svc.sh-helm-test.svc"
+ value: "user-manager.sh-helm-test.svc"
- equal:
path: spec.dnsNames[4]
- value: "user-manager-svc.sh-helm-test"
+ value: "user-manager.sh-helm-test"
- equal:
path: spec.dnsNames[5]
- value: "user-manager-svc"
\ No newline at end of file
+ value: "user-manager"
\ No newline at end of file
--
GitLab