* [feat] update k3s version

easysoft · Aug 2, 2024 · c4cc3b0 · c4cc3b0
1 parent ea00f65
commit c4cc3b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 35 deletions.
diff --git a/common/const.go b/common/const.go
@@ -72,7 +72,7 @@ const (
 	K3sBinPath                    = "/usr/local/bin/k3s"
 	HelmBinName                   = "helm"
 	HelmBinPath                   = "/usr/local/bin/helm"
-	K3sBinVersion                 = "v1.28.9+k3s1"
+	K3sBinVersion                 = "v1.28.12+k3s1"
 	K3sBinURL                     = "https://github.com/k3s-io/k3s/releases/download"
 	K3sAgentEnv                   = "/etc/systemd/system/k3s-agent.service.env"
 	K3sKubeConfig                 = "/etc/rancher/k3s/k3s.yaml"

diff --git a/hack/manifests/storage/local-storage.yaml b/hack/manifests/storage/local-storage.yaml
@@ -67,7 +67,7 @@ spec:
             effect: "NoSchedule"
       containers:
       - name: q-local-provisioner
-        image: "hub.zentao.net/rancher/local-path-provisioner:v0.0.26"
+        image: "hub.zentao.net/rancher/local-path-provisioner:v0.0.28"
         imagePullPolicy: IfNotPresent
         command:
         - local-path-provisioner
@@ -119,39 +119,13 @@ data:
     }
   setup: |-
     #!/bin/sh
-    while getopts "m:s:p:" opt
-    do
-        case $opt in
-            p)
-            absolutePath=$OPTARG
-            ;;
-            s)
-            sizeInBytes=$OPTARG
-            ;;
-            m)
-            volMode=$OPTARG
-            ;;
-        esac
-    done
-    mkdir -m 0777 -p ${absolutePath}
-    chmod 700 ${absolutePath}/..
+    set -eu
+    mkdir -m 0777 -p "${VOL_DIR}"
+    chmod 700 "${VOL_DIR}/.."
   teardown: |-
     #!/bin/sh
-    while getopts "m:s:p:" opt
-    do
-        case $opt in
-            p)
-            absolutePath=$OPTARG
-            ;;
-            s)
-            sizeInBytes=$OPTARG
-            ;;
-            m)
-            volMode=$OPTARG
-            ;;
-        esac
-    done
-    rm -rf ${absolutePath}
+    set -eu
+    rm -rf "${VOL_DIR}"
   helperPod.yaml: |-
     apiVersion: v1
     kind: Pod

diff --git a/hack/scripts/getk3s.sh b/hack/scripts/getk3s.sh
@@ -8,10 +8,10 @@
 set -xe
 
 if [ ! -f "hack/bin/k3s-linux-amd64" ]; then
-	wget -O hack/bin/k3s-linux-amd64 https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s1/k3s
+	wget -O hack/bin/k3s-linux-amd64 https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s
 fi
 if [ ! -f "hack/bin/k3s-linux-arm64" ]; then
-  wget -O hack/bin/k3s-linux-arm64 https://github.com/k3s-io/k3s/releases/download/v1.28.11%2Bk3s1/k3s-arm64
+  wget -O hack/bin/k3s-linux-arm64 https://github.com/k3s-io/k3s/releases/download/v1.28.12%2Bk3s1/k3s-arm64
 fi
 
 chmod +x hack/bin/k3s-linux-amd64 hack/bin/k3s-linux-arm64