Skip to content

Fix/add site identifier support #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kody-iw wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix/add site identifier support #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2213a54
fix(helm/curator): add optional siteIdentifier for multi-site deploym…
kody-iw Oct 21, 2025
cc41dcf
docs(helm/curator): clarify siteIdentifier default behavior in values…
kody-iw Oct 22, 2025
988ab0e
refactor(helm/curator): use helper template and update docs
kody-iw Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion charts/curator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 |

Expand Down
7 changes: 7 additions & 0 deletions charts/curator/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
2 changes: 1 addition & 1 deletion charts/curator/templates/externalsecrets-admin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
4 changes: 2 additions & 2 deletions charts/curator/templates/job-create-admin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
6 changes: 6 additions & 0 deletions charts/curator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down