updated versions/readmes and commented out questions (#54)

* commented out questions * upgraded versions and fixed labels/annotations
rancherfederal · Feb 2, 2025 · ced1c46 · ced1c46
1 parent 897e3dd
commit ced1c46
Show file tree

Hide file tree

Showing 8 changed files with 582 additions and 582 deletions.
diff --git a/charts/cluster-templates/questions.yaml b/charts/cluster-templates/questions.yaml
diff --git a/charts/cluster-templates/values-aws.yaml b/charts/cluster-templates/values-aws.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-aws
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false

diff --git a/charts/cluster-templates/values-custom.yaml b/charts/cluster-templates/values-custom.yaml
@@ -11,13 +11,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-custom
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false

diff --git a/charts/cluster-templates/values-digitalocean.yaml b/charts/cluster-templates/values-digitalocean.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-digitalocean
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false

diff --git a/charts/cluster-templates/values-elemental.yaml b/charts/cluster-templates/values-elemental.yaml
@@ -11,13 +11,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-elemental
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false

diff --git a/charts/cluster-templates/values-harvester.yaml b/charts/cluster-templates/values-harvester.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-harvester
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false

diff --git a/charts/cluster-templates/values-vsphere.yaml b/charts/cluster-templates/values-vsphere.yaml
@@ -18,13 +18,13 @@ vcenter:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-vsphere
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false

diff --git a/charts/cluster-templates/values.yaml b/charts/cluster-templates/values.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false