diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 33dff1bb3..c2006427d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -165,8 +165,9 @@ 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 wait --for condition=established --timeout=10s crd/installations.operator.tigera.io + 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 diff --git a/README.md b/README.md index b8b266b1f..1d19bde3c 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.24/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