diff --git a/.github/workflows/release-daily.yaml b/.github/workflows/release-daily.yaml index 8f29bca4f..208da4805 100644 --- a/.github/workflows/release-daily.yaml +++ b/.github/workflows/release-daily.yaml @@ -129,7 +129,7 @@ jobs: release: - needs: [daily-version, upload-package] + needs: [upload-package, release-cli] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 37c12b486..23930296f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -85,7 +85,7 @@ jobs: release: runs-on: ubuntu-latest - needs: [upload-package] + needs: [upload-package, release-cli] steps: - name: 'Checkout source code' diff --git a/cli/pkg/common/common.go b/cli/pkg/common/common.go index 85d378140..e51263d35 100755 --- a/cli/pkg/common/common.go +++ b/cli/pkg/common/common.go @@ -23,8 +23,8 @@ import ( ) const ( - DefaultK8sVersion = "v1.32.2" - DefaultK3sVersion = "v1.32.2-k3s" + DefaultK8sVersion = "v1.33.3" + DefaultK3sVersion = "v1.33.3-k3s" DefaultKubernetesVersion = "" DefaultKubeSphereVersion = "v3.3.0" DefaultTokenMaxAge = 31536000 diff --git a/cli/pkg/k3s/templates/k3sServiceEnv.go b/cli/pkg/k3s/templates/k3sServiceEnv.go index d57313875..92d28a872 100644 --- a/cli/pkg/k3s/templates/k3sServiceEnv.go +++ b/cli/pkg/k3s/templates/k3sServiceEnv.go @@ -42,5 +42,6 @@ K3S_KUBECONFIG_MODE=644 K3S_TOKEN={{ .Token }} {{ end }} GODEBUG=netdns=go +CATTLE_NEW_SIGNED_CERT_EXPIRATION_DAYS=36500 `))) diff --git a/infrastructure/k3s/.olares/Olares.yaml b/infrastructure/k3s/.olares/Olares.yaml index 11ae7d132..32d7bf239 100644 --- a/infrastructure/k3s/.olares/Olares.yaml +++ b/infrastructure/k3s/.olares/Olares.yaml @@ -4,6 +4,6 @@ output: binaries: - id: k3s - name: k3s-v1.32.2 - amd64: https://github.com/k3s-io/k3s/releases/download/v1.32.2+k3s1/k3s - arm64: https://github.com/k3s-io/k3s/releases/download/v1.32.2+k3s1/k3s-arm64 + name: k3s-v1.33.3 + amd64: https://github.com/k3s-io/k3s/releases/download/v1.33.3+k3s1/k3s + arm64: https://github.com/k3s-io/k3s/releases/download/v1.33.3+k3s1/k3s-arm64 diff --git a/infrastructure/kubernetes/.olares/Olares.yaml b/infrastructure/kubernetes/.olares/Olares.yaml index 8db139000..9ad820625 100644 --- a/infrastructure/kubernetes/.olares/Olares.yaml +++ b/infrastructure/kubernetes/.olares/Olares.yaml @@ -4,19 +4,19 @@ output: binaries: - id: kubeadm - name: kubeadm-v1.32.2,pkg/kube/v1.32.2 - amd64: https://dl.k8s.io/release/v1.32.2/bin/linux/amd64/kubeadm - arm64: https://dl.k8s.io/release/v1.32.2/bin/linux/arm64/kubeadm + name: kubeadm-v1.33.3,pkg/kube/v1.33.3 + amd64: https://dl.k8s.io/release/v1.33.3/bin/linux/amd64/kubeadm + arm64: https://dl.k8s.io/release/v1.33.3/bin/linux/arm64/kubeadm - id: kubelet - name: kubelet-v1.32.2,pkg/kube/v1.32.2 - amd64: https://dl.k8s.io/release/v1.32.2/bin/linux/amd64/kubelet - arm64: https://dl.k8s.io/release/v1.32.2/bin/linux/arm64/kubelet + name: kubelet-v1.33.3,pkg/kube/v1.33.3 + amd64: https://dl.k8s.io/release/v1.33.3/bin/linux/amd64/kubelet + arm64: https://dl.k8s.io/release/v1.33.3/bin/linux/arm64/kubelet - id: kubectl - name: kubectl-v1.32.2,pkg/kube/v1.32.2 - amd64: https://dl.k8s.io/release/v1.32.2/bin/linux/amd64/kubectl - arm64: https://dl.k8s.io/release/v1.32.2/bin/linux/arm64/kubectl + name: kubectl-v1.33.3,pkg/kube/v1.33.3 + amd64: https://dl.k8s.io/release/v1.33.3/bin/linux/amd64/kubectl + arm64: https://dl.k8s.io/release/v1.33.3/bin/linux/arm64/kubectl containers: - name: owncloudci/wait-for:latest @@ -29,13 +29,13 @@ output: - name: bitnami/kube-rbac-proxy:0.19.0 - - name: registry.k8s.io/kube-apiserver:v1.32.2 + name: registry.k8s.io/kube-apiserver:v1.33.3 - - name: registry.k8s.io/kube-scheduler:v1.32.2 + name: registry.k8s.io/kube-scheduler:v1.33.3 - - name: registry.k8s.io/kube-proxy:v1.32.2 + name: registry.k8s.io/kube-proxy:v1.33.3 - - name: registry.k8s.io/kube-controller-manager:v1.32.2 + name: registry.k8s.io/kube-controller-manager:v1.33.3 - name: registry.k8s.io/pause:3.10