synchronized default value files

rancherfederal · Jun 25, 2024 · ad94bd3 · ad94bd3
1 parent 053ff0e
commit ad94bd3
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 41 deletions.
diff --git a/charts/cluster-templates/questions.yaml b/charts/cluster-templates/questions.yaml
@@ -27,13 +27,13 @@ questions:
       - custom
     group: 'General'
   - variable: kubernetesVersion
-    default: v1.27.12+rke2r1
+    default: v1.28.10+rke2r1
     description: 'Specify Kubernetes Version'
     label: 'Kubernetes Version'
     type: enum
     required: true
     options:
-      - v1.27.12+rke2r1
+      - v1.28.10+rke2r1
       - v1.26.13+rke2r1
       - v1.25.16+rke2r1
       - v1.24.17+rke2r1

diff --git a/charts/cluster-templates/values-aws.yaml b/charts/cluster-templates/values-aws.yaml
@@ -19,7 +19,7 @@ cluster:
     # key: value
   name: rke2-cluster-aws
   config:
-    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.28.10+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
@@ -69,8 +69,8 @@ cluster:
         # - kube scheduler arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler)
       # kube_apiserver_arg:
         # - kube apiserver arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver)
-      # kube_proxy_arg: # (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
-        # - kube proxy arguments here
+      # kube_proxy_arg:
+        # - kube proxy arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
       # kubelet_arg:
         # - kubelet arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet)
     # controlPlaneConfig:

diff --git a/charts/cluster-templates/values-custom.yaml b/charts/cluster-templates/values-custom.yaml
@@ -16,11 +16,10 @@ cluster:
     # key: value
   name: rke2-cluster-custom
   config:
-    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.28.10+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
-
     # additionalManifests: |-
     #   apiVersion: v1
     #   kind: Pod
@@ -32,7 +31,6 @@ cluster:
     #       image: example:1.0.0
     #       ports:
     #       - containerPort: 80
-
     # agentEnvVars:
       # - key:value
     # defaultClusterRoleForProjectMembers: ''
@@ -68,8 +66,8 @@ cluster:
         # - kube scheduler arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler)
       # kube_apiserver_arg:
         # - kube apiserver arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver)
-      # kube_proxy_arg: # (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
-        # - kube proxy arguments here
+      # kube_proxy_arg:
+        # - kube proxy arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
       # kubelet_arg:
         # - kubelet arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet)
     # controlPlaneConfig:

diff --git a/charts/cluster-templates/values-digitalocean.yaml b/charts/cluster-templates/values-digitalocean.yaml
@@ -19,7 +19,7 @@ cluster:
     # key: value
   name: rke2-cluster-digitalocean
   config:
-    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.28.10+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
@@ -69,8 +69,8 @@ cluster:
         # - kube scheduler arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler)
       # kube_apiserver_arg:
         # - kube apiserver arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver)
-      # kube_proxy_arg: # (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
-        # - kube proxy arguments here
+      # kube_proxy_arg:
+        # - kube proxy arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
       # kubelet_arg:
         # - kubelet arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet)
     # controlPlaneConfig:

diff --git a/charts/cluster-templates/values-elemental.yaml b/charts/cluster-templates/values-elemental.yaml
@@ -17,10 +17,10 @@ cluster:
     # key: value
   # labels:
     # key: value
-  name: elemental-cluster
+  name: rke2-cluster-elemental
   config:
-    systemDefaultRegistry: docker.io # default registry
-    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.28.10+rke2r1 # https://github.com/rancher/rke2/releases
+    enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
     # additionalManifests: |-
@@ -36,30 +36,49 @@ cluster:
     #       - containerPort: 80
     # agentEnvVars:
       # - key:value
-    cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
-    docker: false
-    disable_kube_proxy: false
-    etcd_expose_metrics: false
-    enableNetworkPolicy: true
     # defaultClusterRoleForProjectMembers: ''
     # defaultPodSecurityAdmissionConfigurationTemplateName: ''
     # defaultPodSecurityPolicyTemplateName: ''
-    profile: '' # cis-1.6, cis-1.23
-    selinux: false
-    secrets_encryption: false
-    write_kubeconfig_mode: 0600
-    use_service_account_credentials: false
-    protect_kernel_defaults: false
-    cloud_provider_name: '' # https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers
-    # cloud_provider_config: '' # cloud provider config secret here (example: secret://fleet-default:cloudprovider)
-    # kube_controller_manager_arg:
-      # - kube controller manager arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager)
-    # kube_scheduler_arg:
-      # - kube scheduler arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler)
-    # kube_apiserver_arg:
-      # - kube apiserver arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver)
-    # kubelet_arg:
-      # - kubelet arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet)
+    globalConfig:
+      systemDefaultRegistry: docker.io # default registry
+      cni: canal # canal, calico, cilium, multus,canal, multus,calico, multus,cilium
+      docker: false
+      # token: ''
+      # tls-san:
+        # - url
+        # - ip
+      # disable:
+        # - rke2-coredns
+        # - rke2-ingress-nginx
+        # - rke2-metrics-server
+      disable_scheduler: false
+      disable_cloud_controller: false
+      disable_kube_proxy: false
+      etcd_expose_metrics: false
+      profile: '' # cis-1.6, cis-1.23
+      selinux: false
+      secrets_encryption: false
+      write_kubeconfig_mode: 0600
+      use_service_account_credentials: false
+      protect_kernel_defaults: false
+      cloud_provider_name: '' # https://ranchermanager.docs.rancher.com/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers
+      # cloud_provider_config: '' # cloud provider config secret here (example: secret://fleet-default:cloudprovider)
+      # kube_controller_manager_arg:
+        # - kube controller manager arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager)
+      # kube_scheduler_arg:
+        # - kube scheduler arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler)
+      # kube_apiserver_arg:
+        # - kube apiserver arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver)
+      # kube_proxy_arg:
+        # - kube proxy arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
+      # kubelet_arg:
+        # - kubelet arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet)
+    # controlPlaneConfig:
+      # same options as globalConfig
+      # only will apply to the control plane nodes
+    # workerConfig:
+      # same options as globalConfig
+      # only will apply to the worker nodes
     registries:
       enabled: false
       # configs:

diff --git a/charts/cluster-templates/values-harvester.yaml b/charts/cluster-templates/values-harvester.yaml
@@ -19,7 +19,7 @@ cluster:
     # key: value
   name: rke2-cluster-harvester
   config:
-    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.28.10+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
@@ -69,8 +69,8 @@ cluster:
         # - kube scheduler arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-scheduler)
       # kube_apiserver_arg:
         # - kube apiserver arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver)
-      # kube_proxy_arg: # (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
-        # - kube proxy arguments here
+      # kube_proxy_arg:
+        # - kube proxy arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kube-proxy)
       # kubelet_arg:
         # - kubelet arguments here (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet)
     # controlPlaneConfig:

diff --git a/charts/cluster-templates/values.yaml b/charts/cluster-templates/values.yaml
@@ -19,7 +19,7 @@ cluster:
     # key: value
   name: rke2-cluster
   config:
-    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.28.10+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false