From 9dde37238c47fb4d6137d2cd900c992b84f9dce3 Mon Sep 17 00:00:00 2001 From: Anshal Shukla Date: Sat, 11 Feb 2023 21:42:52 +0530 Subject: [PATCH] Upgrade k8s to v1.25.3 and istio to v1.16.0 Signed-off-by: Anshal Shukla --- CHANGELOG.md | 2 +- configs/kind/kubeadm.conf | 2 +- docs/developers_guide.md | 2 +- scripts/cluster/setup_master_node.sh | 8 ++++---- scripts/github_runner/Dockerfile.cri_dev_env | 2 +- scripts/install_stock.sh | 2 +- scripts/setup_zipkin.sh | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 583f66463..44c3fdcd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ ### Added ### Changed -- Bumped Containerd to v1.6, Knative to v1.9, Go to v1.18, Kubernetes to v1.23, Istio to 1.12, protoc to 3.19, runc to 1.1. +- Bumped Containerd to v1.6, Knative to v1.9, Go to v1.18, Kubernetes to v1.25.3, Istio to 1.16.0, protoc to 3.19, runc to 1.1. ### Fixed diff --git a/configs/kind/kubeadm.conf b/configs/kind/kubeadm.conf index a42d0888e..ba114e1f8 100644 --- a/configs/kind/kubeadm.conf +++ b/configs/kind/kubeadm.conf @@ -1,6 +1,6 @@ apiVersion: kubeadm.k8s.io/v1beta3 kind: ClusterConfiguration -kubernetesVersion: v1.23.5 +kubernetesVersion: v1.25.3 networking: podSubnet: 192.168.0.0/16 scheduler: diff --git a/docs/developers_guide.md b/docs/developers_guide.md index 1fc09e98a..40c0b40cb 100644 --- a/docs/developers_guide.md +++ b/docs/developers_guide.md @@ -185,7 +185,7 @@ Here are some useful commands (there are plenty of Zipkin tutorials online): of our [fork](https://github.com/vhive-serverless/firecracker-containerd) of the upstream repository. Currently, we are in the process of upstreaming VM snapshots support to the upstream repository. -* Current Firecracker version is 0.24.0, Knative 1.9, Kubernetes 1.23.5, gVisor 20210622.0, and Istio 1.12.5. +* Current Firecracker version is 0.24.0, Knative 1.9, Kubernetes 1.25.3, gVisor 20210622.0, and Istio 1.16.0. We plan to keep our code loosely up to date with the upstream Firecracker repository. * vHive uses a [fork](https://github.com/ease-lab/kind) of [kind](https://github.com/kubernetes-sigs/kind) diff --git a/scripts/cluster/setup_master_node.sh b/scripts/cluster/setup_master_node.sh index 8834782fa..c338b8fcd 100755 --- a/scripts/cluster/setup_master_node.sh +++ b/scripts/cluster/setup_master_node.sh @@ -43,9 +43,9 @@ kubectl apply -f $ROOT/configs/metallb/metallb-configmap.yaml # istio cd $ROOT -curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.12.5 TARGET_ARCH=x86_64 sh - -export PATH=$PATH:$ROOT/istio-1.12.5/bin -sudo sh -c "echo 'export PATH=\$PATH:$ROOT/istio-1.12.5/bin' >> /etc/profile" +curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.16.0 TARGET_ARCH=x86_64 sh - +export PATH=$PATH:$ROOT/istio-1.16.0/bin +sudo sh -c "echo 'export PATH=\$PATH:$ROOT/istio-1.16.0/bin' >> /etc/profile" istioctl install -y -f $ROOT/configs/istio/istio-minimal-operator.yaml KNATIVE_VERSION="knative-v1.9.0" @@ -67,7 +67,7 @@ kubectl apply --filename $ROOT/configs/registry/repository-update-hosts.yaml # magic DNS kubectl apply --filename $ROOT/configs/knative_yamls/serving-default-domain.yaml -kubectl apply --filename https://github.com/knative/net-istio/releases/download/$KNATIVE_VERSION/release.yaml +kubectl apply --filename https://github.com/knative/net-istio/releases/download/$KNATIVE_VERSION/net-istio.yaml # install knative eventing kubectl apply --filename https://github.com/knative/eventing/releases/download/$KNATIVE_VERSION/eventing-crds.yaml diff --git a/scripts/github_runner/Dockerfile.cri_dev_env b/scripts/github_runner/Dockerfile.cri_dev_env index 91ec68b72..ef344db4b 100644 --- a/scripts/github_runner/Dockerfile.cri_dev_env +++ b/scripts/github_runner/Dockerfile.cri_dev_env @@ -20,7 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -FROM kindest/node:v1.23.5 +FROM kindest/node:v1.25.3 RUN apt-get update && \ apt-get upgrade --yes && \ diff --git a/scripts/install_stock.sh b/scripts/install_stock.sh index 5d3b378d7..eae3cea38 100755 --- a/scripts/install_stock.sh +++ b/scripts/install_stock.sh @@ -45,7 +45,7 @@ containerd --version || echo "failed to build containerd" # Install k8s -K8S_VERSION=1.23.5-00 +K8S_VERSION=1.25.3-00 curl --silent --show-error https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - sudo sh -c "echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list" sudo apt-get update >> /dev/null diff --git a/scripts/setup_zipkin.sh b/scripts/setup_zipkin.sh index 435ba7375..ed347471a 100755 --- a/scripts/setup_zipkin.sh +++ b/scripts/setup_zipkin.sh @@ -24,7 +24,7 @@ set -e # install zipkin pods -kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.12/samples/addons/extras/zipkin.yaml +kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.16/samples/addons/extras/zipkin.yaml sleep 10s