Skip to content

Commit

Permalink
Merge pull request #525 from alexander-demicev/fiximageshelm
Browse files Browse the repository at this point in the history
Add helm chart value to override CAPI images
  • Loading branch information
alexander-demicev authored May 2, 2024
2 parents 79f15fa + aee71a2 commit 449f771
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
6 changes: 6 additions & 0 deletions charts/rancher-turtles/templates/core-provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ spec:
selector: {{ index .Values "cluster-api-operator" "cluster-api" "core" "fetchConfig" "selector" }}
{{- end }}
{{- end }}
{{- if index .Values "cluster-api-operator" "cluster-api" "core" "image" }}
deployment:
containers:
- name: manager
image: {{ index .Values "cluster-api-operator" "cluster-api" "core" "image" }}
{{- end }}
---
apiVersion: v1
kind: ConfigMap
Expand Down
6 changes: 6 additions & 0 deletions charts/rancher-turtles/templates/rke2-bootstrap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,10 @@ spec:
selector: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "fetchConfig" "selector" }}
{{- end }}
{{- end }}
{{- if index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "image" }}
deployment:
containers:
- name: manager
image: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "bootstrap" "image" }}
{{- end }}
{{- end }}
6 changes: 6 additions & 0 deletions charts/rancher-turtles/templates/rke2-controlplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,10 @@ spec:
selector: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "fetchConfig" "selector" }}
{{- end }}
{{- end }}
{{- if index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "image" }}
deployment:
containers:
- name: manager
image: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "controlPlane" "image" }}
{{- end }}
{{- end }}
3 changes: 3 additions & 0 deletions charts/rancher-turtles/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ cluster-api-operator:
defaultName: capi-env-variables
core:
namespace: capi-system
image: ""
fetchConfig:
url: ""
selector: ""
Expand All @@ -57,11 +58,13 @@ cluster-api-operator:
version: ""
bootstrap:
namespace: rke2-bootstrap-system
image: ""
fetchConfig:
url: ""
selector: ""
controlPlane:
namespace: rke2-control-plane-system
image: ""
fetchConfig:
url: ""
selector: ""

0 comments on commit 449f771

Please sign in to comment.