Merge pull request #629 from projectcalico/dev/nsk-fix-kind-yaml

yaml: update kind install yaml to fix DNS
projectcalico · Aug 24, 2023 · ba374a0 · ba374a0
2 parents fa19aa6 + 2b8596c
commit ba374a0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/yaml/generated/calico-vpp-kind.yaml b/yaml/generated/calico-vpp-kind.yaml
@@ -165,6 +165,18 @@ data:
     {
       "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"
+        }
+      ]
     }
   CALICOVPP_INTERFACES: |-
     {

diff --git a/yaml/generated/calico-vpp-multinet.yaml b/yaml/generated/calico-vpp-multinet.yaml
@@ -230,7 +230,7 @@ spec:
         k8s-app: calico-vpp-node
     spec:
       containers:
-      - image: docker.io/calicovpp/multinet-monitor:v3.24.1
+      - image: docker.io/calicovpp/multinet-monitor:prerelease
         imagePullPolicy: IfNotPresent
         name: multinet-monitor
         resources:
@@ -335,7 +335,7 @@ spec:
       initContainers:
       - command:
         - /entrypoint
-        image: docker.io/calicovpp/install-whereabouts:latest
+        image: docker.io/calicovpp/install-whereabouts:prerelease
         name: install-whereabouts
         volumeMounts:
         - mountPath: /host/opt/cni/bin

diff --git a/yaml/overlays/kind/kind-config.yaml b/yaml/overlays/kind/kind-config.yaml
@@ -14,3 +14,20 @@ data:  # Configuration template for VPP in Kind
         }
       ]
     }
+  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/yaml/overlays/multinet/multinet.yaml b/yaml/overlays/multinet/multinet.yaml
@@ -112,6 +112,7 @@ rules:
       - globalfelixconfigs
       - felixconfigurations
       - bgppeers
+      - bgpfilters
       - globalbgpconfigs
       - bgpconfigurations
       - ippools