diff --git a/charts/curator/README.md b/charts/curator/README.md index 58175f0..e631027 100644 --- a/charts/curator/README.md +++ b/charts/curator/README.md @@ -1,6 +1,6 @@ # curator -![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2025.08-03](https://img.shields.io/badge/AppVersion-2025.08--03-informational?style=flat-square) +![Version: 2.1.0](https://img.shields.io/badge/Version-2.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2025.08-03](https://img.shields.io/badge/AppVersion-2025.08--03-informational?style=flat-square) A Helm chart for Curator in a Container in Kubernetes @@ -85,6 +85,7 @@ A Helm chart for Curator in a Container in Kubernetes | serviceAccount.imagePullSecrets | list | `[]` | Image pull secrets for the service account | | serviceAccount.labels | object | `{}` | Labels for the service account | | serviceAccount.name | string | `nil` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template | +| siteIdentifier | string | `""` | When not set (default), uses existing {environment}-admin naming pattern | | tolerations | list | `[]` | | | topologySpreadConstraints | list | `[]` | Pod Topology Spread Constraints | diff --git a/charts/curator/templates/_helpers.tpl b/charts/curator/templates/_helpers.tpl index dbb0a45..a5f2408 100644 --- a/charts/curator/templates/_helpers.tpl +++ b/charts/curator/templates/_helpers.tpl @@ -133,4 +133,11 @@ limits: memory: 512Mi {{- end -}} {{- end -}} +{{- end -}} + +{{/* +Create the admin secret name based on environment and optional siteIdentifier +*/}} +{{- define "curator.adminSecretName" -}} +{{- .Values.environment }}{{- if .Values.siteIdentifier }}-{{ .Values.siteIdentifier }}{{- end }}-admin {{- end -}} \ No newline at end of file diff --git a/charts/curator/templates/externalsecrets-admin.yaml b/charts/curator/templates/externalsecrets-admin.yaml index 5f03b75..b37f334 100644 --- a/charts/curator/templates/externalsecrets-admin.yaml +++ b/charts/curator/templates/externalsecrets-admin.yaml @@ -1,7 +1,7 @@ apiVersion: external-secrets.io/v1 kind: ExternalSecret metadata: - name: {{ .Values.environment }}-admin + name: {{ include "curator.adminSecretName" . }} namespace: {{ .Release.Namespace }} spec: secretStoreRef: diff --git a/charts/curator/templates/job-create-admin.yaml b/charts/curator/templates/job-create-admin.yaml index ab01bba..28238e1 100644 --- a/charts/curator/templates/job-create-admin.yaml +++ b/charts/curator/templates/job-create-admin.yaml @@ -49,12 +49,12 @@ spec: - name: WEBADMIN_PASSWORD valueFrom: secretKeyRef: - name: {{ printf "%s-%s" .Values.environment "admin" }} + name: {{ include "curator.adminSecretName" . }} key: admin-password - name: WEBADMIN_USER valueFrom: secretKeyRef: - name: {{ printf "%s-%s" .Values.environment "admin" }} + name: {{ include "curator.adminSecretName" . }} key: admin-user {{ range $key, $value := .Values.curator.env }} - name: "{{ $key }}" diff --git a/charts/curator/values.yaml b/charts/curator/values.yaml index 9084e36..2c43c74 100644 --- a/charts/curator/values.yaml +++ b/charts/curator/values.yaml @@ -5,6 +5,12 @@ replicaCount: ~ # -- Required to be either prod, qa, or dev environment: prod # needs to be either dev, qa, or prod +# -- Site identifier for multi-site deployments in the same namespace +# -- This is used to create unique ExternalSecret names to avoid conflicts +# -- When set, creates {environment}-{siteIdentifier}-admin naming pattern +# -- When not set (default), uses existing {environment}-admin naming pattern +siteIdentifier: "" + # -- Image configuration image: # -- Repository name