more small updates

rancherfederal · Apr 16, 2024 · 0918a1b · 0918a1b
1 parent c36e9fb
commit 0918a1b
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 16 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -23,18 +23,18 @@ jobs:
         env:
           CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
 
-      - name: Authenticate to GHCR
+      - name: Authenticate to GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Push Chart(s) to GHCR
+      - name: Push Chart(s) to GitHub Container Registry
         run: |
-          for pkg in .cr-release-packages/*; do
-            if [ -z "${pkg:-}" ]; then
+          for package in .cr-release-packages/*; do
+            if [ -z "${package:-}" ]; then
               break
             fi
-            helm push "${pkg}" oci://ghcr.io/${GITHUB_REPOSITORY_OWNER}/charts
+            helm push "${package}" oci://ghcr.io/${{ github.repository_owner }}/charts
           done
diff --git a/charts/cluster-templates/.helmignore b/charts/cluster-templates/.helmignore
@@ -0,0 +1,21 @@
+# HELM IGNORE OPTIONS:
+# Patterns to ignore when building Helm packages.
+# Supports shell glob matching, relative path matching, and negation (prefixed with !)
+
+.DS_Store
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/cluster-templates/questions.yaml b/charts/cluster-templates/questions.yaml
@@ -27,16 +27,16 @@ questions:
       - custom
     group: 'General'
   - variable: kubernetesVersion
-    default: v1.26.10+rke2r2
+    default: v1.27.12+rke2r1
     description: 'Specify Kubernetes Version'
     label: 'Kubernetes Version'
     type: enum
     required: true
     options:
-      - v1.26.10+rke2r2
-      - v1.25.15+rke2r2
-      - v1.24.17+rke2r2
-      - v1.23.17+rke2r2
+      - v1.27.12+rke2r1
+      - v1.26.13+rke2r1
+      - v1.25.16+rke2r1
+      - v1.24.17+rke2r1
     group: 'General'
   - variable: localClusterAuthEndpoint.enabled
     default: false

diff --git a/charts/cluster-templates/templates/cluster.yaml b/charts/cluster-templates/templates/cluster.yaml
@@ -236,7 +236,7 @@ spec:
         {{- range .Values.cluster.config.registries.mirrors }}
         {{ .name }}:
           endpoint:
-            {{- range .endpoint }}
+            {{- range .endpoints }}
             - {{ . }}
             {{- end }}
           {{- if .rewrite }}

diff --git a/charts/cluster-templates/values-aws.yaml b/charts/cluster-templates/values-aws.yaml
@@ -20,7 +20,7 @@ cluster:
   name: rke2-cluster-aws
   config:
     systemDefaultRegistry: docker.io # default registry
-    kubernetesVersion: v1.27.10+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
     localClusterAuthEndpoint:
       enabled: false
     # agentEnvVars:

diff --git a/charts/cluster-templates/values-custom.yaml b/charts/cluster-templates/values-custom.yaml
@@ -17,7 +17,7 @@ cluster:
   name: rke2-cluster-custom
   config:
     systemDefaultRegistry: docker.io # default registry
-    kubernetesVersion: v1.27.10+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
     localClusterAuthEndpoint:
       enabled: false
     # agentEnvVars:

diff --git a/charts/cluster-templates/values-digitalocean.yaml b/charts/cluster-templates/values-digitalocean.yaml
@@ -20,7 +20,7 @@ cluster:
   name: rke2-cluster-digitalocean
   config:
     systemDefaultRegistry: docker.io # default registry
-    kubernetesVersion: v1.27.10+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
     localClusterAuthEndpoint:
       enabled: false
     # agentEnvVars:

diff --git a/charts/cluster-templates/values-harvester.yaml b/charts/cluster-templates/values-harvester.yaml
@@ -20,7 +20,7 @@ cluster:
   name: rke2-cluster-harvester
   config:
     systemDefaultRegistry: docker.io # default registry
-    kubernetesVersion: v1.27.10+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
     localClusterAuthEndpoint:
       enabled: false
     # agentEnvVars:

diff --git a/charts/cluster-templates/values.yaml b/charts/cluster-templates/values.yaml
@@ -20,7 +20,7 @@ cluster:
   name: rke2-cluster
   config:
     systemDefaultRegistry: docker.io # default registry
-    kubernetesVersion: v1.27.10+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.27.12+rke2r1 # https://github.com/rancher/rke2/releases
     localClusterAuthEndpoint:
       enabled: false
     # agentEnvVars: