From 198fd0839778f796ac7858b9815c4778964e5b80 Mon Sep 17 00:00:00 2001 From: TomasKohout Date: Wed, 15 May 2024 15:23:29 +0200 Subject: [PATCH 1/5] Update Chart.yaml --- helm/trident-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/trident-operator/Chart.yaml b/helm/trident-operator/Chart.yaml index 17e21ccfe..9f952ec0f 100644 --- a/helm/trident-operator/Chart.yaml +++ b/helm/trident-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: trident-operator -version: 100.2405.0 # Some services require a semver here: "100." +version: 101.2405.0 # Some services require a semver here: "100." kubeVersion: ">= 1.24.0-0" description: "A Helm chart for deploying NetApp's Trident CSI storage provisioner using the Trident Operator." type: application From d4cc211bc078c8761ae777ae4812252d3078e1f9 Mon Sep 17 00:00:00 2001 From: TomasKohout Date: Wed, 15 May 2024 15:23:55 +0200 Subject: [PATCH 2/5] Update tridentorchestrator.yaml --- helm/trident-operator/templates/tridentorchestrator.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 }} From 18ef46d263bb0c10a7604023af6fb034f71a9ca4 Mon Sep 17 00:00:00 2001 From: TomasKohout Date: Wed, 15 May 2024 15:24:10 +0200 Subject: [PATCH 3/5] Update values.yaml --- helm/trident-operator/values.yaml | 5 +++++ 1 file changed, 5 insertions(+) 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 From 4df0f52d61aa858b86ab678284424bf9a7f698f9 Mon Sep 17 00:00:00 2001 From: TomasKohout Date: Wed, 15 May 2024 15:24:47 +0200 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 7a3deb6c3844de55eaae30ff8be46ed047e6ed6e Mon Sep 17 00:00:00 2001 From: TomasKohout Date: Thu, 16 May 2024 16:31:17 +0200 Subject: [PATCH 5/5] Update helm/trident-operator/Chart.yaml --- helm/trident-operator/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/trident-operator/Chart.yaml b/helm/trident-operator/Chart.yaml index 9f952ec0f..17e21ccfe 100644 --- a/helm/trident-operator/Chart.yaml +++ b/helm/trident-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: trident-operator -version: 101.2405.0 # Some services require a semver here: "100." +version: 100.2405.0 # Some services require a semver here: "100." kubeVersion: ">= 1.24.0-0" description: "A Helm chart for deploying NetApp's Trident CSI storage provisioner using the Trident Operator." type: application