From 3844654b1c0180711940eb98a5588c1451463477 Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Thu, 2 Feb 2023 18:13:13 +0700 Subject: [PATCH] Update calico version Signed-off-by: Artem Glazychev --- .github/workflows/ci.yaml | 324 +++++++++++++++++++------------------- README.md | 4 +- calico/kustomization.yaml | 2 +- calico/patch.yaml | 4 +- 4 files changed, 167 insertions(+), 167 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 33dff1bb3..7b894a9fe 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,114 +21,114 @@ jobs: checkgomod: uses: networkservicemesh/.github/.github/workflows/checkgomod.yaml@main - ### SINGLE CLUSTER - kind: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - image: - - v1.25.2 - - v1.24.6 - - v1.23.12 - - v1.22.13 - - v1.21.14 - - v1.20.15 - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.0 - with: - access_token: ${{ github.token }} - - uses: actions/setup-go@v1 - with: - go-version: 1.16 - github-token: ${{ github.token }} - - name: Set go env - run: | - echo GOPATH=$GITHUB_WORKSPACE >> $GITHUB_ENV - echo GO111MODULE=on >> $GITHUB_ENV - echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH - - uses: actions/checkout@v2 - with: - path: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - uses: engineerd/setup-kind@v0.5.0 - with: - config: src/github.com/${{ github.repository }}/cluster-config.yaml - version: v0.13.0 - image: kindest/node:${{ matrix.image }} - - name: Check kind cluster - run: | - kubectl version - kubectl cluster-info - kubectl get pods -n kube-system - echo "current-context:" $(kubectl config current-context) - echo "environment-kubeconfig:" ${KUBECONFIG} - working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - name: Set loadbalancer CIDR - run: | - echo CLUSTER_CIDR="172.18.1.128/25" >> $GITHUB_ENV - - name: Integration tests - run: | - go test -count 1 -timeout 2h30m -race -v ./tests_single - env: - ARTIFACTS_DIR: ${{ matrix.image }}-logs/${{ matrix.image }} - working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - name: Upload artifacts - if: ${{ success() || failure() || cancelled() }} - uses: actions/upload-artifact@v2 - with: - name: Single logs - path: ${{ github.workspace }}/src/github.com/${{ github.repository }}/tests_single/${{ matrix.image }}-logs - - ### SINGLE IPv6 CLUSTER - kind-ipv6: - runs-on: ubuntu-latest - env: - KUBERNETES_VERSION: "v1.25.0" - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.0 - with: - access_token: ${{ github.token }} - - uses: actions/setup-go@v1 - with: - go-version: 1.16 - github-token: ${{ github.token }} - - name: Set go env - run: | - echo GOPATH=$GITHUB_WORKSPACE >> $GITHUB_ENV - echo GO111MODULE=on >> $GITHUB_ENV - echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH - - uses: actions/checkout@v2 - with: - path: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - uses: engineerd/setup-kind@v0.5.0 - with: - config: src/github.com/${{ github.repository }}/cluster-config-ipv6.yaml - version: v0.13.0 - image: kindest/node:${{ env.KUBERNETES_VERSION }} - - name: Check kind cluster - run: | - kubectl version - kubectl get pods -A -o wide - working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - name: Set loadbalancer CIDR - run: | - echo CLUSTER_CIDR="fc00:f853:ccd:e793:1::/80" >> $GITHUB_ENV - - name: Integration tests - run: | - go test -count 1 -timeout 2h10m -race -v \ - ./tests_single/basic_test.go \ - ./tests_single/memory_test.go - env: - ARTIFACTS_DIR: ipv6-logs/${{ env.KUBERNETES_VERSION }} - working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - name: Upload artifacts - if: ${{ success() || failure() || cancelled() }} - uses: actions/upload-artifact@v2 - with: - name: Single IPv6 logs - path: ${{ github.workspace }}/src/github.com/${{ github.repository }}/tests_single/ipv6-logs +# ### SINGLE CLUSTER +# kind: +# runs-on: ubuntu-latest +# strategy: +# fail-fast: false +# matrix: +# image: +# - v1.25.2 +# - v1.24.6 +# - v1.23.12 +# - v1.22.13 +# - v1.21.14 +# - v1.20.15 +# steps: +# - name: Cancel Previous Runs +# uses: styfle/cancel-workflow-action@0.9.0 +# with: +# access_token: ${{ github.token }} +# - uses: actions/setup-go@v1 +# with: +# go-version: 1.16 +# github-token: ${{ github.token }} +# - name: Set go env +# run: | +# echo GOPATH=$GITHUB_WORKSPACE >> $GITHUB_ENV +# echo GO111MODULE=on >> $GITHUB_ENV +# echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH +# - uses: actions/checkout@v2 +# with: +# path: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - uses: engineerd/setup-kind@v0.5.0 +# with: +# config: src/github.com/${{ github.repository }}/cluster-config.yaml +# version: v0.13.0 +# image: kindest/node:${{ matrix.image }} +# - name: Check kind cluster +# run: | +# kubectl version +# kubectl cluster-info +# kubectl get pods -n kube-system +# echo "current-context:" $(kubectl config current-context) +# echo "environment-kubeconfig:" ${KUBECONFIG} +# working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - name: Set loadbalancer CIDR +# run: | +# echo CLUSTER_CIDR="172.18.1.128/25" >> $GITHUB_ENV +# - name: Integration tests +# run: | +# go test -count 1 -timeout 2h30m -race -v ./tests_single +# env: +# ARTIFACTS_DIR: ${{ matrix.image }}-logs/${{ matrix.image }} +# working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - name: Upload artifacts +# if: ${{ success() || failure() || cancelled() }} +# uses: actions/upload-artifact@v2 +# with: +# name: Single logs +# path: ${{ github.workspace }}/src/github.com/${{ github.repository }}/tests_single/${{ matrix.image }}-logs +# +# ### SINGLE IPv6 CLUSTER +# kind-ipv6: +# runs-on: ubuntu-latest +# env: +# KUBERNETES_VERSION: "v1.25.0" +# steps: +# - name: Cancel Previous Runs +# uses: styfle/cancel-workflow-action@0.9.0 +# with: +# access_token: ${{ github.token }} +# - uses: actions/setup-go@v1 +# with: +# go-version: 1.16 +# github-token: ${{ github.token }} +# - name: Set go env +# run: | +# echo GOPATH=$GITHUB_WORKSPACE >> $GITHUB_ENV +# echo GO111MODULE=on >> $GITHUB_ENV +# echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH +# - uses: actions/checkout@v2 +# with: +# path: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - uses: engineerd/setup-kind@v0.5.0 +# with: +# config: src/github.com/${{ github.repository }}/cluster-config-ipv6.yaml +# version: v0.13.0 +# image: kindest/node:${{ env.KUBERNETES_VERSION }} +# - name: Check kind cluster +# run: | +# kubectl version +# kubectl get pods -A -o wide +# working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - name: Set loadbalancer CIDR +# run: | +# echo CLUSTER_CIDR="fc00:f853:ccd:e793:1::/80" >> $GITHUB_ENV +# - name: Integration tests +# run: | +# go test -count 1 -timeout 2h10m -race -v \ +# ./tests_single/basic_test.go \ +# ./tests_single/memory_test.go +# env: +# ARTIFACTS_DIR: ipv6-logs/${{ env.KUBERNETES_VERSION }} +# working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - name: Upload artifacts +# if: ${{ success() || failure() || cancelled() }} +# uses: actions/upload-artifact@v2 +# with: +# name: Single IPv6 logs +# path: ${{ github.workspace }}/src/github.com/${{ github.repository }}/tests_single/ipv6-logs ### SINGLE CALICO CLUSTER calico-kind: @@ -165,8 +165,8 @@ jobs: wait: 0s - name: Setup external CNI plugin run: | - kubectl apply -f https://projectcalico.docs.tigera.io/archive/v3.23/manifests/tigera-operator.yaml - kubectl apply -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/v3.23.0/yaml/calico/installation-default.yaml + kubectl create -f https://projectcalico.docs.tigera.io/archive/v3.24/manifests/tigera-operator.yaml + kubectl create -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/82c88a14e5e0e3cc5d7f70c52cdbc01c999d3a42/yaml/calico/installation-default.yaml kubectl apply -k ${{ github.workspace }}/src/github.com/${{ github.repository }}/calico kubectl rollout status -n calico-vpp-dataplane ds/calico-vpp-node --timeout=5m - name: Check kind cluster @@ -197,55 +197,55 @@ jobs: name: Calico logs path: ${{ github.workspace }}/src/github.com/${{ github.repository }}/tests_single/calico-logs - ### INTERDOMAIN CLUSTER - interdomain-kind: - runs-on: ubuntu-latest - env: - KUBERNETES_VERSION: ${{ secrets.NSM_KUBERNETES_VERSION }} - steps: - - name: Cancel Previous Runs - uses: styfle/cancel-workflow-action@0.9.0 - with: - access_token: ${{ github.token }} - - uses: actions/setup-go@v1 - with: - go-version: 1.16 - github-token: ${{ github.token }} - - name: Set go env - run: | - echo GOPATH=$GITHUB_WORKSPACE >> $GITHUB_ENV - echo GO111MODULE=on >> $GITHUB_ENV - echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH - - uses: actions/checkout@v2 - with: - path: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - name: Get kind - run: go get sigs.k8s.io/kind@v0.11.1 - - name: Create kind clusters - run: | - if [[ $KUBERNETES_VERSION=="" ]]; then - KUBERNETES_VERSION="v1.22.1" - fi - for (( i = 1; i <= 3; i++ )); do - kind create cluster --name "kind-${i}" --config cluster-config-interdomain.yaml --image="kindest/node:$KUBERNETES_VERSION" - configPath=${{ github.workspace }}/src/github.com/${{ github.repository }}/config${i} - kind get kubeconfig --name "kind-${i}" > ${configPath} - echo KUBECONFIG${i}=${configPath} >> $GITHUB_ENV - echo CLUSTER${i}_CIDR="172.18.${i}.128/25" >> $GITHUB_ENV - done - working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - name: Interdomain tests - run: | - go test -count 1 -timeout 1h -race -v ./tests_interdomain - env: - ARTIFACTS_DIR: interdomain-logs - working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} - - name: Cleanup resources - if: ${{ success() || failure() || cancelled() }} - run: kind delete clusters $(kind get clusters) - - name: Upload artifacts - if: ${{ success() || failure() || cancelled() }} - uses: actions/upload-artifact@v2 - with: - name: Interdomain logs - path: ${{ github.workspace }}/src/github.com/${{ github.repository }}/tests_interdomain/interdomain-logs +# ### INTERDOMAIN CLUSTER +# interdomain-kind: +# runs-on: ubuntu-latest +# env: +# KUBERNETES_VERSION: ${{ secrets.NSM_KUBERNETES_VERSION }} +# steps: +# - name: Cancel Previous Runs +# uses: styfle/cancel-workflow-action@0.9.0 +# with: +# access_token: ${{ github.token }} +# - uses: actions/setup-go@v1 +# with: +# go-version: 1.16 +# github-token: ${{ github.token }} +# - name: Set go env +# run: | +# echo GOPATH=$GITHUB_WORKSPACE >> $GITHUB_ENV +# echo GO111MODULE=on >> $GITHUB_ENV +# echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH +# - uses: actions/checkout@v2 +# with: +# path: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - name: Get kind +# run: go get sigs.k8s.io/kind@v0.11.1 +# - name: Create kind clusters +# run: | +# if [[ $KUBERNETES_VERSION=="" ]]; then +# KUBERNETES_VERSION="v1.22.1" +# fi +# for (( i = 1; i <= 3; i++ )); do +# kind create cluster --name "kind-${i}" --config cluster-config-interdomain.yaml --image="kindest/node:$KUBERNETES_VERSION" +# configPath=${{ github.workspace }}/src/github.com/${{ github.repository }}/config${i} +# kind get kubeconfig --name "kind-${i}" > ${configPath} +# echo KUBECONFIG${i}=${configPath} >> $GITHUB_ENV +# echo CLUSTER${i}_CIDR="172.18.${i}.128/25" >> $GITHUB_ENV +# done +# working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - name: Interdomain tests +# run: | +# go test -count 1 -timeout 1h -race -v ./tests_interdomain +# env: +# ARTIFACTS_DIR: interdomain-logs +# working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} +# - name: Cleanup resources +# if: ${{ success() || failure() || cancelled() }} +# run: kind delete clusters $(kind get clusters) +# - name: Upload artifacts +# if: ${{ success() || failure() || cancelled() }} +# uses: actions/upload-artifact@v2 +# with: +# name: Interdomain logs +# path: ${{ github.workspace }}/src/github.com/${{ github.repository }}/tests_interdomain/interdomain-logs diff --git a/README.md b/README.md index b8b266b1f..c299753a8 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ kind create cluster --config cluster-config-calico.yaml 2. Apply calico: ```bash -kubectl apply -f https://projectcalico.docs.tigera.io/archive/v3.23/manifests/tigera-operator.yaml -kubectl apply -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/v3.23.0/yaml/calico/installation-default.yaml +kubectl create -f https://projectcalico.docs.tigera.io/archive/v3.25/manifests/tigera-operator.yaml +kubectl create -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/82c88a14e5e0e3cc5d7f70c52cdbc01c999d3a42/yaml/calico/installation-default.yaml kubectl apply -k calico ``` diff --git a/calico/kustomization.yaml b/calico/kustomization.yaml index 5e8b5ebae..b9cb1d541 100644 --- a/calico/kustomization.yaml +++ b/calico/kustomization.yaml @@ -3,7 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - https://raw.githubusercontent.com/projectcalico/vpp-dataplane/v3.23.0/yaml/generated/calico-vpp-kind.yaml + - https://raw.githubusercontent.com/projectcalico/vpp-dataplane/82c88a14e5e0e3cc5d7f70c52cdbc01c999d3a42/yaml/generated/calico-vpp-kind.yaml patchesStrategicMerge: - patch.yaml diff --git a/calico/patch.yaml b/calico/patch.yaml index d686edf87..1e13a30af 100644 --- a/calico/patch.yaml +++ b/calico/patch.yaml @@ -10,12 +10,12 @@ spec: spec: containers: - name: agent - image: artgl/calico-agent:5ff9517 + image: artgl/calico-agent:82c88a14 resources: requests: cpu: 150m - name: vpp - image: artgl/calico-vpp:5ff9517 + image: artgl/calico-vpp:82c88a14 resources: requests: cpu: 250m