diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f06bb88d..b0b08d052 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ **Enhancements:** - iSCSI self-healing will now initiate SCSI scans by exact LUN ID if deprecated igroups are in use (Issue [#883](https://github.com/NetApp/trident/issues/883)). -- **Kubernetes**: Trident DaemonSet will now clean zombie mounts and residual tracking files at startup. +- **Kubernetes:** Trident DaemonSet will now clean zombie mounts and residual tracking files at startup. +- **Kubernetes:** Added `orchestratorImageRegistry` and `enableTridentOrchestrator` attributes to the Helm chart to enable users to specify different imageRegistries for this helm chart and TridentOrchestrator resource. ## v24.02.0 diff --git a/helm/trident-operator/templates/tridentorchestrator.yaml b/helm/trident-operator/templates/tridentorchestrator.yaml index 86b7789c5..51edbb877 100644 --- a/helm/trident-operator/templates/tridentorchestrator.yaml +++ b/helm/trident-operator/templates/tridentorchestrator.yaml @@ -1,3 +1,4 @@ +{{ if .Values.enableTridentOrchestrator }} apiVersion: trident.netapp.io/v1 kind: TridentOrchestrator metadata: @@ -24,8 +25,8 @@ spec: logLayers: {{ include "trident.logLayers" $ }} probePort: {{ include "trident.probePort" $ }} tridentImage: {{ include "trident.image" $ }} - {{- if .Values.imageRegistry }} - imageRegistry: {{ .Values.imageRegistry }} + {{- if .Values.orchestratorImageRegistry }} + imageRegistry: {{ .Values.orchestratorImageRegistry }} {{- end }} kubeletDir: {{ .Values.kubeletDir }} {{- with .Values.imagePullSecrets }} @@ -68,3 +69,4 @@ spec: acpImage: {{ .Values.acpImage }} iscsiSelfHealingInterval: {{ .Values.iscsiSelfHealingInterval }} iscsiSelfHealingWaitTime: {{ .Values.iscsiSelfHealingWaitTime }} +{{ end }} diff --git a/helm/trident-operator/values.yaml b/helm/trident-operator/values.yaml index 23376c83c..1aedba2de 100644 --- a/helm/trident-operator/values.yaml +++ b/helm/trident-operator/values.yaml @@ -36,6 +36,11 @@ affinity: {} # imageRegistry identifies the registry for the trident-operator, trident, and other images. Leave empty to accept the default. imageRegistry: "" +# use to enable/disable deployment of trident orchestrator +enableTridentOrchestrator: true +# orchestratorImageRegistry is used in the TridentOrchestrator for imageRegistry parameter +orchestratorImageRegistry: null + # imagePullPolicy sets the image pull policy for the trident-operator. imagePullPolicy: IfNotPresent