Merge pull request #107 from DVPE-cloud/feature/update-certificate-is…

…suer-controller changed format for external secrets
DVPE-cloud · May 2, 2023 · 1054675 · 1054675
2 parents 6f9ea0d + 2b77989
commit 1054675
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/charts/dvpe-certificate-issuer-controller/CHANGELOG.md b/charts/dvpe-certificate-issuer-controller/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.0]
+### Changed
+* Format of ExternalSecret change for docker-reg-secret and issuer-secret
+
 ## [2.1.0]
 ### Changed
 * Name of Secret Store now must be passed as variable
@@ -85,3 +89,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [0.2.3]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-certificate-issuer-controller-0.2.3/charts/dvpe-certificate-issuer-controller
 [2.0.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-certificate-issuer-controller-2.0.0/charts/dvpe-certificate-issuer-controller
 [2.1.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-certificate-issuer-controller-2.1.0/charts/dvpe-certificate-issuer-controller
+[2.2.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-certificate-issuer-controller-2.2.0/charts/dvpe-certificate-issuer-controller
diff --git a/charts/dvpe-certificate-issuer-controller/Chart.yaml b/charts/dvpe-certificate-issuer-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.1.1
 description: Helm chart for deploying a custom certificate issuer controller. The certificate issuer controller is a [cert-manager](https://cert-manager.io/docs/) resource managing certificate requests in a private PKI.
 name: dvpe-certificate-issuer-controller
-version: 2.1.0
+version: 2.2.0
 keywords:
   - automation
   - gitops

diff --git a/charts/dvpe-certificate-issuer-controller/README.md b/charts/dvpe-certificate-issuer-controller/README.md
@@ -1,6 +1,6 @@
 # dvpe-certificate-issuer-controller
 
-![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square)
 
 Helm chart for deploying a custom certificate issuer controller. The certificate issuer controller is a [cert-manager](https://cert-manager.io/docs/) resource managing certificate requests in a private PKI.
 

diff --git a/charts/dvpe-certificate-issuer-controller/templates/externalsecret.yaml b/charts/dvpe-certificate-issuer-controller/templates/externalsecret.yaml
@@ -1,32 +1,39 @@
 {{- $namespace := .Release.Namespace }}
 
 {{- with .Values.issuercontroller.externalsecrets }}
+---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: {{ default .name .dockerCredentials }}
   namespace: {{ $namespace }}
 spec:
+  refreshInterval: 1h
   secretStoreRef:
     kind: SecretStore
     name:  {{ .secretStoreRefName }}
   target:
     template:
+      data:
+        .dockerconfigjson: '{{ .dockerRegSecret }}'
       type: kubernetes.io/dockerconfigjson
     name: {{ default .name .dockerCredentials }}
     creationPolicy: Owner
-  dataFrom:
-    - extract:
-        key: "{{ default .name .dockerCredentials }}"
+  data:
+    - remoteRef:
+        key: {{ default .name .dockerCredentials }}
+      secretKey: dockerRegSecret
+
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: wadtfy-cluster-issuer-secret
   namespace: {{ $namespace }}
 spec:
+  refreshInterval: 1h
   secretStoreRef:
-    kind: SecretStore
+    kind: ClusterSecretStore
     name: {{ .secretStoreRefName }}
   target:
     name: {{ .clusterIssuer }}