diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index 364716e7297..3a72e3d9abd 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -24,6 +24,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -108,6 +109,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -185,6 +187,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -244,6 +247,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -322,6 +326,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 steps: @@ -390,6 +395,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -441,6 +447,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 steps: @@ -491,6 +498,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -544,6 +552,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -667,6 +676,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 @@ -717,6 +727,7 @@ jobs: matrix: branch: - master + - release-1.11 - release-1.10 - release-1.9 - release-1.8 diff --git a/dist/images/Dockerfile b/dist/images/Dockerfile index f346273188e..9213ee25b4e 100644 --- a/dist/images/Dockerfile +++ b/dist/images/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:experimental -FROM kubeovn/kube-ovn-base:v1.11.0 +FROM kubeovn/kube-ovn-base:v1.12.0 COPY *.sh /kube-ovn/ COPY kubectl-ko /kube-ovn/kubectl-ko diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index c137c154f73..d57bf0dd4be 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -90,7 +90,7 @@ ARG ARCH ENV CNI_VERSION=v1.1.1 RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap ./macvlan -ENV KUBE_VERSION="v1.24.2" +ENV KUBE_VERSION="v1.24.9" RUN curl -L https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${ARCH}.tar.gz | tar -xz -C . && cp ./kubernetes/client/bin/kubectl /usr/bin/kubectl \ && chmod +x /usr/bin/kubectl && rm -rf ./kubernetes diff --git a/dist/images/Dockerfile.debug b/dist/images/Dockerfile.debug index 7fe7583f51c..de6c65f1ed9 100644 --- a/dist/images/Dockerfile.debug +++ b/dist/images/Dockerfile.debug @@ -103,7 +103,7 @@ ARG ARCH ENV CNI_VERSION=v1.1.1 RUN curl -sSf -L --retry 5 https://github.com/containernetworking/plugins/releases/download/${CNI_VERSION}/cni-plugins-linux-${ARCH}-${CNI_VERSION}.tgz | tar -xz -C . ./loopback ./portmap ./macvlan -ENV KUBE_VERSION="v1.24.2" +ENV KUBE_VERSION="v1.24.9" RUN curl -L https://dl.k8s.io/${KUBE_VERSION}/kubernetes-client-linux-${ARCH}.tar.gz | tar -xz -C . && cp ./kubernetes/client/bin/kubectl /usr/bin/kubectl \ && chmod +x /usr/bin/kubectl && rm -rf ./kubernetes diff --git a/dist/images/Dockerfile.no-avx512 b/dist/images/Dockerfile.no-avx512 index 27d6b007978..a39b30810e6 100644 --- a/dist/images/Dockerfile.no-avx512 +++ b/dist/images/Dockerfile.no-avx512 @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:experimental -FROM kubeovn/kube-ovn-base:v1.11.0-no-avx512 +FROM kubeovn/kube-ovn-base:v1.12.0-no-avx512 COPY *.sh /kube-ovn/ COPY kubectl-ko /kube-ovn/kubectl-ko diff --git a/hack/update-codegen-docker.sh b/hack/update-codegen-docker.sh index 8b2c53dbeb4..77dffc2cd52 100755 --- a/hack/update-codegen-docker.sh +++ b/hack/update-codegen-docker.sh @@ -14,4 +14,4 @@ docker run -it --rm \ -e GROUPS_VERSION="kubeovn:v1" \ -e GENERATION_TARGETS="deepcopy,client,informer,lister" \ -e GOPROXY=${GOPROXY} \ - quay.io/slok/kube-code-generator:v1.25.0 + quay.io/slok/kube-code-generator:v1.26.0