forked from suse-edge/Factory
rancher-turtles: image/version fixes
After further testing I discovered that the cluster-api-controller is not correctly pinned or using the downstream image, and a similar problem exists for CAPM3 (but only after upgrade from an older chart) due to a mistake in the templating.
This commit is contained in:
@@ -2,6 +2,15 @@
|
||||
{{- $namespace := index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "namespace" }}
|
||||
{{- if not (lookup "v1" "Namespace" "" $namespace) }}
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
annotations:
|
||||
"helm.sh/hook": "post-install, post-upgrade"
|
||||
"helm.sh/hook-weight": "1"
|
||||
name: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "namespace" }}
|
||||
{{- end }}
|
||||
---
|
||||
apiVersion: turtles-capi.cattle.io/v1alpha1
|
||||
kind: ClusterctlConfig
|
||||
metadata:
|
||||
@@ -13,15 +22,6 @@ spec:
|
||||
url: "https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.7.2/infrastructure-components.yaml"
|
||||
type: InfrastructureProvider
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
annotations:
|
||||
"helm.sh/hook": "post-install, post-upgrade"
|
||||
"helm.sh/hook-weight": "1"
|
||||
name: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "namespace" }}
|
||||
{{- end }}
|
||||
---
|
||||
apiVersion: turtles-capi.cattle.io/v1alpha1
|
||||
kind: CAPIProvider
|
||||
metadata:
|
||||
@@ -33,8 +33,8 @@ metadata:
|
||||
spec:
|
||||
name: metal3
|
||||
type: infrastructure
|
||||
{{- if index .Values "cluster-api-operator" "cluster-api" "rke2" "version" }}
|
||||
version: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "version" }}
|
||||
{{- if index .Values "cluster-api-operator" "cluster-api" "metal3" "version" }}
|
||||
version: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "version" }}
|
||||
{{- end }}
|
||||
configSecret:
|
||||
{{- if index .Values "cluster-api-operator" "cluster-api" "configSecret" "name" }}
|
||||
|
Reference in New Issue
Block a user