From d9c4c86244a67637dc996eac6be4a0cfe1197e5f Mon Sep 17 00:00:00 2001 From: Dennis Huang Date: Tue, 23 Jul 2024 14:59:06 +0800 Subject: [PATCH] Update packages version. Signed-off-by: Dennis Huang --- ci/k3d/setup-k3d.sh | 9 +++++---- ci/setup_env.sh | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/k3d/setup-k3d.sh b/ci/k3d/setup-k3d.sh index 4f6bc741..024ee8f6 100755 --- a/ci/k3d/setup-k3d.sh +++ b/ci/k3d/setup-k3d.sh @@ -4,7 +4,7 @@ PRIMEHUB_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. cd $PRIMEHUB_ROOT CLUSTER_NAME=${CLUSTER_NAME:-primehub} -K8S_VERSION=${K8S_VERSION:-"v1.21.2-k3s1"} +K8S_VERSION=${K8S_VERSION:-"v1.26.15-k3s1"} BIND_ADDRESS=${BIND_ADDRESS:-10.88.88.88} PRIMEHUB_PORT=${PRIMEHUB_PORT:-8080} @@ -54,10 +54,11 @@ helm install nginx-ingress ingress-nginx/ingress-nginx \ --namespace nginx-ingress \ --set controller.hostNetwork=true \ --set controller.admissionWebhooks.enabled=false \ - --set controller.updateStrategy.type=RollingUpdate \ - --set controller.updateStrategy.rollingUpdate.maxUnavailable=1 \ - --set controller.updateStrategy.rollingUpdate.maxSurge=1 \ + --set rbac.create=true \ --set defaultBackend.enabled=true + #--set controller.updateStrategy.type=RollingUpdate \ + #--set controller.updateStrategy.rollingUpdate.maxUnavailable=1 \ + #--set controller.updateStrategy.rollingUpdate.maxSurge=1 \ kubectl apply -f k3d/nginx-config.yaml diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 8ec4dfc7..e3108640 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -29,12 +29,12 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get clean sudo rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install kubectl -curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl && \ +curl -sLO https://storage.googleapis.com/kubernetes-release/release/v1.26.15/bin/linux/amd64/kubectl && \ chmod a+x kubectl && \ sudo mv kubectl /usr/local/bin K3D_VERSION=4.4.8 -HELM_VERSION=3.6.2 +HELM_VERSION=3.15.3 HELMFILE_VERSION=v0.144.0 NVM_VERSION=0.39.0 NODEJS_VERSION=14.18.0