Skip to content

Allow users to specify different image registry for helm chart resources and TridentOrchestrator #904

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
TomasKohout wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Allow users to specify different image registry for helm chart resources and TridentOrchestrator #904

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
198fd08
Update Chart.yaml
TomasKohout May 15, 2024
d4cc211
Update tridentorchestrator.yaml
TomasKohout May 15, 2024
18ef46d
Update values.yaml
TomasKohout May 15, 2024
4df0f52
Update CHANGELOG.md
TomasKohout May 15, 2024
7a3deb6
Update helm/trident-operator/Chart.yaml
TomasKohout May 16, 2024
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion helm/trident-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: trident-operator
version: 100.2405.0 # Some services require a semver here: "100.<CalVer>"
version: 101.2405.0 # Some services require a semver here: "100.<CalVer>"
Comment thread
TomasKohout marked this conversation as resolved.
Outdated
kubeVersion: ">= 1.24.0-0"
description: "A Helm chart for deploying NetApp's Trident CSI storage provisioner using the Trident Operator."
type: application
Expand Down
6 changes: 4 additions & 2 deletions helm/trident-operator/templates/tridentorchestrator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{ if .Values.enableTridentOrchestrator }}
apiVersion: trident.netapp.io/v1
kind: TridentOrchestrator
metadata:
Expand All @@ -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 }}
Expand Down Expand Up @@ -68,3 +69,4 @@ spec:
acpImage: {{ .Values.acpImage }}
iscsiSelfHealingInterval: {{ .Values.iscsiSelfHealingInterval }}
iscsiSelfHealingWaitTime: {{ .Values.iscsiSelfHealingWaitTime }}
{{ end }}
5 changes: 5 additions & 0 deletions helm/trident-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down