Fix: controlPlaneConfig was renamed to machineGlobalConfig before 2.6…

….0 release

charts/rancher-aws-cluster-template/templates/cluster.yaml

@@ -39,5 +39,5 @@ spec:
         name: {{ $clustername }}-worker
       paused: false
       displayName: {{ $clustername }}-worker
-    controlPlaneConfig:
+    machineGlobalConfig:
       cni: calico

charts/rancher-do-cluster-template/templates/cluster.yaml

@@ -20,5 +20,5 @@ spec:
         name: {{ .Values.cluster.name }}-nodes
       paused: false
       displayName: {{ .Values.cluster.name }}-nodes
-    controlPlaneConfig:
+    machineGlobalConfig:
       cni: calico

charts/rancher-equinix-cluster-template/templates/cluster.yaml

@@ -42,72 +42,8 @@ spec:
       {{- end }}
       {{- end }}
     {{- end }}
-    controlPlaneConfig:
-      # Path to the file that defines the audit policy configuration
-      # audit-policy-file: ""
-      # IPv4/IPv6 network CIDRs to use for pod IPs (default: 10.42.0.0/16)
-      # cluster-cidr: ""
-      # IPv4 Cluster IP for coredns service. Should be in your service-cidr range (default: 10.43.0.10)
-      # cluster-dns: ""
-      # Cluster Domain (default: "cluster.local")
-      # cluster-domain: ""
-      # CNI Plugin to deploy, one of none, canal, cilium (default: "canal")
+    machineGlobalConfig:
       cni: calico
-      # Do not deploy packaged components and delete any deployed components (valid items: rke2-coredns, rke2-ingress-nginx, rke2-kube-proxy, rke2-metrics-server)
-      # disable: false
-      # Disable automatic etcd snapshots
-      # etcd-disable-snapshots: false
-      # Expose etcd metrics to client interface. (Default false)
-      # etcd-expose-metrics: false
-      # Directory to save db snapshots. (Default location: ${data-dir}/db/snapshots)
-      # etcd-snapshot-dir: ""
-      # Set the base name of etcd snapshots. Default: etcd-snapshot-<unix-timestamp> (default: "etcd-snapshot")
-      # etcd-snapshot-name: ""
-      # Number of snapshots to retain (default: 5)
-      # etcd-snapshot-retention: 5
-      # Snapshot interval time in cron spec. eg. every 5 hours '* */5 * * *' (default: "0 */12 * * *")
-      # etcd-snapshot-schedule-cron: "0 */12 * * *"
-      # Customized flag for kube-apiserver process
-      # kube-apiserver-arg: ""
-      # Customized flag for kube-scheduler process
-      # kube-scheduler-arg: ""
-      # Customized flag for kube-controller-manager process
-      # kube-controller-manager-arg: ""
-      # Validate system configuration against the selected benchmark (valid items: cis-1.5, cis-1.6 )
-      # profile: "cis-1.6"
-      # Enable Secret encryption at rest
-      # secrets-encryption: false
-      # IPv4/IPv6 network CIDRs to use for service IPs (default: 10.43.0.0/16)
-      # service-cidr: "10.43.0.0/16"
-      # Port range to reserve for services with NodePort visibility (default: "30000-32767")
-      # service-node-port-range: "30000-32767"
-      # Add additional hostnames or IPv4/IPv6 addresses as Subject Alternative Names on the server TLS cert
-      # tls-san: []
-
-    # workerConfig:
-    # - config:
-        # Node name
-        # node-name: ""
-        # Disable embedded containerd and use alternative CRI implementation
-        # container-runtime-endpoint: ""
-        # Override default containerd snapshotter (default: "overlayfs")
-        # snapshotter: ""
-        # IP address to advertise for node
-        # node-ip: "1.1.1.1"
-        # Kubelet resolv.conf file
-        # resolv-conf: ""
-        # Customized flag for kubelet process
-        # kubelet-arg: ""
-        # Customized flag for kube-proxy process
-        # kube-proxy-arg: ""
-        # Kernel tuning behavior. If set, error if kernel tunables are different than kubelet defaults. (default: false)
-        # protect-kernel-defaults: false
-        # Enable SELinux in containerd (default: false)
-        # selinux: true
-        # Cloud provider name
-        # cloud-provider-name: ""
-        # Cloud provider configuration file path
-        # cloud-provider-config: ""
     {{- if .Values.rke.localClusterAuthEndpoint.enabled }}
     localClusterAuthEndpoint:
       enabled: {{ .Values.rke.localClusterAuthEndpoint.enabled }}
@@ -117,20 +53,8 @@ spec:
     upgradeStrategy:
       controlPlaneDrainOptions:
         enabled: false
-        # deleteEmptyDirData: false
-        # disableEviction: false
-        # gracePeriod: 0
-        # ignoreErrors: false
-        # skipWaitForDeleteTimeoutSeconds: 0
-        # timeout: 0
       workerDrainOptions:
         enabled: false
-        # deleteEmptyDirData: false
-        # disableEviction: false
-        # gracePeriod: 0
-        # ignoreErrors: false
-        # skipWaitForDeleteTimeoutSeconds: 0
-        # timeout: 0
       workerConcurrency: "10%"
       controlPlaneConcurrency: "10%"
 {{- if .Values.agentEnvs }}