Merge pull request #113 from DVPE-cloud/feature/removeSecret

remove cluster issuer secret
DVPE-cloud · Jun 6, 2023 · 4362c62 · 4362c62
2 parents 44be004 + 27b2bed
commit 4362c62
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 35 deletions.
diff --git a/charts/dvpe-certificate-issuer-controller/CHANGELOG.md b/charts/dvpe-certificate-issuer-controller/CHANGELOG.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [2.3.0]
+### Removed
+* Remove secret for cluster issuer. Secret will be deployed in cluster-issuer chart.
 
 ## [2.2.1]
 ### Fixed
@@ -95,3 +98,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [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
 [2.2.1]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-certificate-issuer-controller-2.2.1/charts/dvpe-certificate-issuer-controller
+[2.3.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-certificate-issuer-controller-2.3.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.2.1
+version: 2.3.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.2.1](https://img.shields.io/badge/Version-2.2.1-informational?style=flat-square)
+![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.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.
 
@@ -32,8 +32,7 @@ s
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| issuercontroller | object | `{"externalsecrets":{"clusterIssuer":null,"dockerCredentials":null,"name":null,"secretStoreRefName":null},"plane":{"name":"wadtfy-cert-issuer-controller-system"},"spec":{"image":{"name":"wadtfy-issuer","pullPolicy":"IfNotPresent","repository":null,"tag":"v1.2.0"}}}` | -----------------------------# |
-| issuercontroller.externalsecrets.clusterIssuer | string | `nil` | The name of the external secret for the cluster certificate issuer |
+| issuercontroller | object | `{"externalsecrets":{"dockerCredentials":null,"name":null,"secretStoreRefName":null},"plane":{"name":"wadtfy-cert-issuer-controller-system"},"spec":{"image":{"name":"wadtfy-issuer","pullPolicy":"IfNotPresent","repository":null,"tag":"v1.2.0"}}}` | -----------------------------# |
 | issuercontroller.externalsecrets.dockerCredentials | string | `nil` | The name of the external secret key containing the docker credentials for this deployment (earlier: `issuercontroller.externalsecrets.name`) |
 | issuercontroller.externalsecrets.name | string | `nil` | DEPRECATED; rename to `issuercontroller.externalsecrets.dockerCredentials` |
 | issuercontroller.externalsecrets.secretStoreRefName | string | `nil` | Name of the External Secret's Secret Store to use |

diff --git a/charts/dvpe-certificate-issuer-controller/templates/externalsecret.yaml b/charts/dvpe-certificate-issuer-controller/templates/externalsecret.yaml
@@ -25,20 +25,5 @@ spec:
       secretKey: dockerRegSecret
 
 ---
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: wadtfy-cluster-issuer-secret
-  namespace: {{ $namespace }}
-spec:
-  refreshInterval: 1h
-  secretStoreRef:
-    kind: ClusterSecretStore
-    name: wadtfy-cluster-secret-store
-  target:
-    name: {{ .clusterIssuer }}
-    creationPolicy: Owner
-  dataFrom:
-    - extract:
-        key: "{{ .clusterIssuer }}"
+
 {{- end}}
diff --git a/charts/dvpe-certificate-issuer-controller/values.schema.json b/charts/dvpe-certificate-issuer-controller/values.schema.json
@@ -11,29 +11,18 @@
               "properties": {
                 "dockerCredentials": {
                   "type": "string"
-                },
-                "clusterIssuer": {
-                  "type": "string"
                 }
               },
               "required": [
-                "dockerCredentials",
-                "clusterIssuer"
+                "dockerCredentials"
               ]
             },
             {
               "properties": {
                 "name": {
                   "type": "string"
-                },
-                "clusterIssuer": {
-                  "type": "string"
                 }
-              },
-              "required": [
-                "name",
-                "clusterIssuer"
-              ]
+              }
             }
           ]
         }

diff --git a/charts/dvpe-certificate-issuer-controller/values.yaml b/charts/dvpe-certificate-issuer-controller/values.yaml
@@ -23,7 +23,5 @@ issuercontroller:
     name:
     # issuercontroller.externalsecrets.dockerCredentials -- The name of the external secret key containing the docker credentials for this deployment (earlier: `issuercontroller.externalsecrets.name`)
     dockerCredentials:
-    # issuercontroller.externalsecrets.clusterIssuer -- The name of the external secret for the cluster certificate issuer
-    clusterIssuer:
     # issuercontroller.externalsecrets.secretStoreRefName -- Name of the External Secret's Secret Store to use
     secretStoreRefName: