Release build

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
networkservicemesh · Sep 19, 2023 · 1888c4d · 1888c4d
1 parent 3febc28
commit 1888c4d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 30 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -222,7 +222,7 @@ jobs:
             fi
             sleep 1s
           done
-          kubectl create -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/ba374a0583d8ab7938d0e46056c148563ee911ec/yaml/calico/installation-default.yaml
+          kubectl create -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/v3.26.0/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
@@ -25,7 +25,7 @@ kind create cluster --config cluster-config-calico.yaml
 2. Apply calico:
 ```bash
 kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.26.1/manifests/tigera-operator.yaml
-kubectl create -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/ba374a0583d8ab7938d0e46056c148563ee911ec/yaml/calico/installation-default.yaml
+kubectl create -f https://raw.githubusercontent.com/projectcalico/vpp-dataplane/v3.26.0/yaml/calico/installation-default.yaml
 kubectl apply -k calico
 ```
 

diff --git 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/ba374a0583d8ab7938d0e46056c148563ee911ec/yaml/generated/calico-vpp-kind.yaml
+  - https://raw.githubusercontent.com/projectcalico/vpp-dataplane/v3.26.0/yaml/generated/calico-vpp-kind.yaml
 
 patchesStrategicMerge:
   - patch.yaml
diff --git a/calico/patch.yaml b/calico/patch.yaml
@@ -10,37 +10,10 @@ spec:
     spec:
       containers:
         - name: agent
-          image: artgl/calicovpp-agent:ba374a0
           resources:
             requests:
               cpu: 150m
         - name: vpp
-          image: artgl/calicovpp-vpp:ba374a0
           resources:
             requests:
               cpu: 250m
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: calico-vpp-config
-  namespace: calico-vpp-dataplane
-data:
-  CALICOVPP_INITIAL_CONFIG: |-
-    {
-      "vppStartupSleepSeconds": 1,
-      "corePattern": "/var/lib/vpp/vppcore.%e.%p",
-      "redirectToHostRules": [
-        {
-          "proto": "udp",
-          "port": 53,
-          "ip": "172.18.0.1"
-        },
-        {
-          "proto": "tcp",
-          "port": 53,
-          "ip": "172.18.0.1"
-        }
-      ]
-    }
diff --git a/tests_single/feature_test.go b/tests_single/feature_test.go
@@ -38,6 +38,7 @@ type calicoFeatureSuite struct {
 func (s *calicoFeatureSuite) BeforeTest(suiteName, testName string) {
 	switch testName {
 	case
+		"TestMutually_aware_nses",
 		"TestNse_composition",
 		"TestVl3_basic",
 		"TestVl3_scale_from_zero":