From 7fc0a7d8b25e0f7edf188525e50e5329f128ea9c Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 6 May 2024 13:18:36 +0200
Subject: [PATCH] ozg-3938 remove subpath
---
src/main/helm/templates/certificate.yaml | 4 ++--
src/main/helm/templates/deployment.yaml | 7 +------
.../templates/truststore/init_truststore_rbac.yaml | 2 +-
src/test/helm/certificate_test.yaml | 2 +-
src/test/helm/deplyoment_cert_bindings_test.yaml | 10 +---------
.../helm/truststore/init_truststore_rbac_test.yaml | 2 +-
6 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/main/helm/templates/certificate.yaml b/src/main/helm/templates/certificate.yaml
index 2e711fd2..350e7cc5 100644
--- a/src/main/helm/templates/certificate.yaml
+++ b/src/main/helm/templates/certificate.yaml
@@ -33,8 +33,8 @@ spec:
issuerRef:
name: user-manager-issuer
kind: Issuer
- duration: 8760h0m0s
- renewBefore: 720h0m0s
+ duration: 8760h0m0s # 1 Jahr
+ renewBefore: 5840h0m0s # 8 Monate
commonName: {{ .Release.Name }}
dnsNames:
- "*.{{ .Release.Name }}.{{ include "app.namespace" . }}.svc.cluster.local"
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 70fdfc86..f085952e 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -194,12 +194,7 @@ spec:
volumeMounts:
{{- if not .Values.disableGrpcServerTls }}
- name: user-manager-tls-certificate
- mountPath: "/user-manager-tls-certificate/tls.crt"
- subPath: tls.crt
- readOnly: true
- - name: user-manager-tls-certificate
- mountPath: "/user-manager-tls-certificate/tls.key"
- subPath: tls.key
+ mountPath: "/user-manager-tls-certificate"
readOnly: true
{{- end }}
{{- if not .Values.disableNamespaceTruststore }}
diff --git a/src/main/helm/templates/truststore/init_truststore_rbac.yaml b/src/main/helm/templates/truststore/init_truststore_rbac.yaml
index 1416ce93..5d0de6ab 100644
--- a/src/main/helm/templates/truststore/init_truststore_rbac.yaml
+++ b/src/main/helm/templates/truststore/init_truststore_rbac.yaml
@@ -57,7 +57,7 @@ rules:
resources:
- jobs
resourceNames:
- - init-user-manager-truststore-job
+ - create-user-manager-truststore
verbs:
- patch
- get
diff --git a/src/test/helm/certificate_test.yaml b/src/test/helm/certificate_test.yaml
index 0fe136c5..594ec04c 100644
--- a/src/test/helm/certificate_test.yaml
+++ b/src/test/helm/certificate_test.yaml
@@ -65,7 +65,7 @@ tests:
asserts:
- equal:
path: spec.renewBefore
- value: 720h0m0s
+ value: 5840h0m0s
- it: should have commonName
asserts:
- equal:
diff --git a/src/test/helm/deplyoment_cert_bindings_test.yaml b/src/test/helm/deplyoment_cert_bindings_test.yaml
index 075a249b..521161e8 100644
--- a/src/test/helm/deplyoment_cert_bindings_test.yaml
+++ b/src/test/helm/deplyoment_cert_bindings_test.yaml
@@ -44,15 +44,7 @@ tests:
path: spec.template.spec.containers[0].volumeMounts
content:
name: user-manager-tls-certificate
- mountPath: "/user-manager-tls-certificate/tls.crt"
- subPath: tls.crt
- readOnly: true
- - contains:
- path: spec.template.spec.containers[0].volumeMounts
- content:
- name: user-manager-tls-certificate
- mountPath: "/user-manager-tls-certificate/tls.key"
- subPath: tls.key
+ mountPath: "/user-manager-tls-certificate"
readOnly: true
- it: should have volumes for user-manager root certificate
diff --git a/src/test/helm/truststore/init_truststore_rbac_test.yaml b/src/test/helm/truststore/init_truststore_rbac_test.yaml
index f50cd8c4..a81aa9eb 100644
--- a/src/test/helm/truststore/init_truststore_rbac_test.yaml
+++ b/src/test/helm/truststore/init_truststore_rbac_test.yaml
@@ -109,7 +109,7 @@ tests:
resources:
- jobs
resourceNames:
- - init-user-manager-truststore-job
+ - create-user-manager-truststore
verbs:
- patch
- get
--
GitLab