diff --git a/charts/cluster-secrets/Chart.yaml b/charts/cluster-secrets/Chart.yaml index b9a2b5c..6c3fb63 100644 --- a/charts/cluster-secrets/Chart.yaml +++ b/charts/cluster-secrets/Chart.yaml @@ -4,7 +4,7 @@ description: Create ClusterSecretStore type: application -version: 0.2.0 +version: 0.3.0 home: https://github.com/isac322/homelab sources: diff --git a/charts/cluster-secrets/templates/cluster-external-secret-cf-api-key.yaml b/charts/cluster-secrets/templates/cluster-external-secret-cf-origin-ca-key.yaml similarity index 71% rename from charts/cluster-secrets/templates/cluster-external-secret-cf-api-key.yaml rename to charts/cluster-secrets/templates/cluster-external-secret-cf-origin-ca-key.yaml index 1de4b63..e02665b 100644 --- a/charts/cluster-secrets/templates/cluster-external-secret-cf-api-key.yaml +++ b/charts/cluster-secrets/templates/cluster-external-secret-cf-origin-ca-key.yaml @@ -1,13 +1,13 @@ -{{- if .Values.clusterExternalSecret.cloudflareCAAPIKey.enabled }} +{{- if .Values.clusterExternalSecret.cloudflare.enabled }} apiVersion: external-secrets.io/v1beta1 kind: ClusterExternalSecret metadata: - name: {{ include "cluster-secrets.fullname" . }}-{{ required "A valid .Values.clusterExternalSecret.cloudflareCAAPIKey.secretName entry required!" .Values.clusterExternalSecret.cloudflareCAAPIKey.secret.name }} + name: {{ include "cluster-secrets.fullname" . }}-{{ required "A valid .Values.clusterExternalSecret.cloudflareOriginCAKey.secretName entry required!" .Values.clusterExternalSecret.cloudflareOriginCAKey.secret.name }} labels: {{- include "cluster-secrets.labels" . | nindent 4 }} spec: # The name to be used on the ExternalSecrets - externalSecretName: {{ .Values.clusterExternalSecret.cloudflareCAAPIKey.secret.name }} + externalSecretName: {{ .Values.clusterExternalSecret.cloudflareOriginCAKey.secret.name }} # This is a basic label selector to select the namespaces to deploy ExternalSecrets to. # you can read more about them here https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#resources-that-support-set-based-requirements @@ -28,11 +28,11 @@ spec: refreshInterval: "1h" target: - name: {{ .Values.clusterExternalSecret.cloudflareCAAPIKey.secret.name }} + name: {{ .Values.clusterExternalSecret.cloudflareOriginCAKey.secret.name }} creationPolicy: Owner deletionPolicy: Delete data: - - secretKey: {{ .Values.clusterExternalSecret.cloudflareCAAPIKey.secret.key }} + - secretKey: {{ .Values.clusterExternalSecret.cloudflareOriginCAKey.secret.key }} remoteRef: - key: {{ .Values.clusterExternalSecret.cloudflareCAAPIKey.externalKeyName }} + key: {{ .Values.clusterExternalSecret.cloudflareOriginCAKey.externalKeyName }} {{- end }} diff --git a/charts/cluster-secrets/values.yaml b/charts/cluster-secrets/values.yaml index 066cc37..2cbe596 100644 --- a/charts/cluster-secrets/values.yaml +++ b/charts/cluster-secrets/values.yaml @@ -34,7 +34,7 @@ clusterSecretStore: # name: "" clusterExternalSecret: - cloudflareCAAPIKey: + cloudflareOriginCAKey: enabled: true externalKeyName: "" secret: diff --git a/values/cluster-secrets/backbone.yaml b/values/cluster-secrets/backbone.yaml index 47af950..66de717 100644 --- a/values/cluster-secrets/backbone.yaml +++ b/values/cluster-secrets/backbone.yaml @@ -13,5 +13,5 @@ clusterSecretStore: namespace: kube-system clusterExternalSecret: - cloudflareCAAPIKey: + cloudflareOriginCAKey: externalKeyName: /homelab/shared/cloudflare/token/origin-ca diff --git a/values/cluster-secrets/prod.yaml b/values/cluster-secrets/prod.yaml index 47af950..66de717 100644 --- a/values/cluster-secrets/prod.yaml +++ b/values/cluster-secrets/prod.yaml @@ -13,5 +13,5 @@ clusterSecretStore: namespace: kube-system clusterExternalSecret: - cloudflareCAAPIKey: + cloudflareOriginCAKey: externalKeyName: /homelab/shared/cloudflare/token/origin-ca