yaml: Add kind/multinet and use 3.26.0 as default version

Signed-off-by: Nathan Skrzypczak <[email protected]>
projectcalico · Jul 5, 2023 · 844d49c · 844d49c
1 parent f4c949f
commit 844d49c
Show file tree

Hide file tree

Showing 11 changed files with 413 additions and 19 deletions.
diff --git a/yaml/Makefile b/yaml/Makefile
@@ -1,6 +1,6 @@
 
-TAG ?= prerelease
-CALICO_TAG ?= master
+TAG ?= v3.26.0
+CALICO_TAG ?= v3.26.0
 
 .PHONY: build
 build: clean
@@ -11,7 +11,7 @@ build: clean
 	kubectl kustomize overlays/eks                             > generated/calico-vpp-eks.yaml
 	kubectl kustomize overlays/eks-dpdk                        > generated/calico-vpp-eks-dpdk.yaml
 	kubectl kustomize overlays/kind                            > generated/calico-vpp-kind.yaml
-	kubectl kustomize overlays/kind                            > generated/calico-vpp-kind.yaml
+	kubectl kustomize overlays/kind-multinet                   > generated/calico-vpp-kind-multinet.yaml
 	# Do not export the test-* overlays, but still check they compile
 	kubectl kustomize overlays/test-vagrant                    > /dev/null
 	kubectl kustomize overlays/test-vagrant-mounts             > /dev/null

diff --git a/yaml/components/multinet/multinet.yaml b/yaml/components/multinet/multinet.yaml
@@ -6,6 +6,8 @@ metadata:
 data:
   CALICOVPP_FEATURE_GATES: |-
     {
+      "memifEnabled": true,
+      "vclEnabled": true,
       "multinetEnabled": true
     }
 ---

diff --git a/yaml/generated/calico-vpp-dpdk.yaml b/yaml/generated/calico-vpp-dpdk.yaml
@@ -219,7 +219,7 @@ spec:
         envFrom:
         - configMapRef:
             name: calico-vpp-config
-        image: docker.io/calicovpp/vpp:prerelease
+        image: docker.io/calicovpp/vpp:v3.26.0
         imagePullPolicy: IfNotPresent
         name: vpp
         resources:
@@ -264,7 +264,7 @@ spec:
         envFrom:
         - configMapRef:
             name: calico-vpp-config
-        image: docker.io/calicovpp/agent:prerelease
+        image: docker.io/calicovpp/agent:v3.26.0
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/yaml/generated/calico-vpp-eks-dpdk.yaml b/yaml/generated/calico-vpp-eks-dpdk.yaml
@@ -230,7 +230,7 @@ spec:
         envFrom:
         - configMapRef:
             name: calico-vpp-config
-        image: docker.io/calicovpp/vpp:prerelease
+        image: docker.io/calicovpp/vpp:v3.26.0
         imagePullPolicy: IfNotPresent
         name: vpp
         resources:
@@ -275,7 +275,7 @@ spec:
         envFrom:
         - configMapRef:
             name: calico-vpp-config
-        image: docker.io/calicovpp/agent:prerelease
+        image: docker.io/calicovpp/agent:v3.26.0
         imagePullPolicy: IfNotPresent
         name: agent
         resources:

diff --git a/yaml/generated/calico-vpp-eks.yaml b/yaml/generated/calico-vpp-eks.yaml
@@ -230,7 +230,7 @@ spec:
         envFrom:
         - configMapRef:
             name: calico-vpp-config
-        image: docker.io/calicovpp/vpp:prerelease
+        image: docker.io/calicovpp/vpp:v3.26.0
         imagePullPolicy: IfNotPresent
         name: vpp
         resources:
@@ -273,7 +273,7 @@ spec:
         envFrom:
         - configMapRef:
             name: calico-vpp-config
-        image: docker.io/calicovpp/agent:prerelease
+        image: docker.io/calicovpp/agent:v3.26.0
         imagePullPolicy: IfNotPresent
         name: agent
         resources: