chore(kind): upgrade K8S to 1.33.4, upgrade calico, upgrade canal, fix default CNI and remove metallb

Author: mborne

kind/README.md

@@ -72,13 +72,10 @@ export KIND_CNI=calico
 bash kind/config/generate.sh
 ```
 
-
 ## Ressources
 
 * [kind.sigs.k8s.io - Quick Start](https://kind.sigs.k8s.io/docs/user/quick-start/)
 * [kind.sigs.k8s.io - Setting Up An Ingress Controller](https://kind.sigs.k8s.io/docs/user/ingress/#setting-up-an-ingress-controller)
     * [config/ingress-ready.yaml](config/ingress-ready.yaml)
     * [traefik - Usage with Kind](../traefik/README.md#usage-with-kind)
     * [nginx-ingress-controller - Usage with Kind](../nginx-ingress-controller/README.md#usage-with-kind)
-* [kind.sigs.k8s.io - Installing MetalLB using default manifests](https://kind.sigs.k8s.io/docs/user/loadbalancer/#installing-metallb-using-default-manifests)
-  * See [metallb-install.sh](metallb-install.sh) where a ".0/24" subnet is required for kind

kind/cni/calico/README.md

@@ -0,0 +1,8 @@
+# calico
+
+* [docs.tigera.io - Calico quickstart guide](https://docs.tigera.io/calico/latest/getting-started/kubernetes/quickstart#install-calico)
+* [docs.tigera.io - Kind multi-node install](https://docs.tigera.io/calico/latest/getting-started/kubernetes/kind)
+
+```bash
+kubectl -n calico-system port-forward svc/whisker 8081:8081
+```

kind/cni/calico/custom-resources.yaml

@@ -1,26 +1,41 @@
 # This section includes base Calico installation configuration.
-# For more information, see: https://projectcalico.docs.tigera.io/master/reference/installation/api#operator.tigera.io/v1.Installation
+# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.Installation
 apiVersion: operator.tigera.io/v1
 kind: Installation
 metadata:
   name: default
 spec:
   # Configures Calico networking.
   calicoNetwork:
-    # Note: The ipPools section cannot be modified post-install.
     ipPools:
-    - blockSize: 26
-      cidr: 10.244.0.0/16
-      encapsulation: VXLANCrossSubnet
-      natOutgoing: Enabled
-      nodeSelector: all()
+      - name: default-ipv4-ippool
+        blockSize: 26
+        # aligned with podSubnet
+        #cidr: 192.168.0.0/16
+        cidr: 10.244.0.0/16
+        encapsulation: VXLANCrossSubnet
+        natOutgoing: Enabled
+        nodeSelector: all()
 
 ---
-
 # This section configures the Calico API server.
-# For more information, see: https://projectcalico.docs.tigera.io/master/reference/installation/api#operator.tigera.io/v1.APIServer
+# For more information, see: https://docs.tigera.io/calico/latest/reference/installation/api#operator.tigera.io/v1.APIServer
 apiVersion: operator.tigera.io/v1
 kind: APIServer
 metadata:
   name: default
-spec: {}
+spec: {}
+
+---
+# Configures the Calico Goldmane flow aggregator.
+apiVersion: operator.tigera.io/v1
+kind: Goldmane
+metadata:
+  name: default
+
+---
+# Configures the Calico Whisker observability UI.
+apiVersion: operator.tigera.io/v1
+kind: Whisker
+metadata:
+  name: default

kind/cni/calico/install.sh

@@ -10,17 +10,31 @@ echo "---------------------------------------------"
 # Install calico
 # see https://docs.tigera.io/calico/latest/getting-started/kubernetes/quickstart#install-calico
 #---------------------------------------------------------------------------
-kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.30.2/manifests/tigera-operator.yaml
+kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.2/manifests/operator-crds.yaml
+kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.2/manifests/tigera-operator.yaml
 # wait for tigera-operator
 kubectl wait --namespace tigera-operator \
     --for=condition=ready pod \
     --selector=k8s-app=tigera-operator \
     --timeout=90s
 
+# sleep 5
+
+# # Wait for Tigera CRDs to be established
+# kubectl wait --for=condition=Established --timeout=60s crd/apiservers.operator.tigera.io
+# kubectl wait --for=condition=Established --timeout=60s crd/gatewayapis.operator.tigera.io
+# kubectl wait --for=condition=Established --timeout=60s crd/goldmanes.operator.tigera.io
+# kubectl wait --for=condition=Established --timeout=60s crd/imagesets.operator.tigera.io
+# kubectl wait --for=condition=Established --timeout=60s crd/installations.operator.tigera.io
+# kubectl wait --for=condition=Established --timeout=60s crd/managementclusterconnections.operator.tigera.io
+# kubectl wait --for=condition=Established --timeout=60s crd/tigerastatuses.operator.tigera.io
+# kubectl wait --for=condition=Established --timeout=60s crd/whiskers.operator.tigera.io
+
+
 # install calico with consistent pod subnet
+#kubectl create -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.2/manifests/custom-resources.yaml
 kubectl apply -f "${SCRIPT_DIR}/custom-resources.yaml"
 
-
 # wait for calico pods
 kubectl wait --namespace calico-system \
     --for=condition=ready pod \

kind/cni/canal/install.sh

@@ -8,7 +8,7 @@ echo "---------------------------------------------"
 # Install canal
 # see https://docs.tigera.io/calico/latest/getting-started/kubernetes/flannel/install-for-flannel#installing-with-the-kubernetes-api-datastore-recommended
 #---------------------------------------------------------------------------
-kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.29.3/manifests/canal.yaml
+kubectl apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.31.2/manifests/canal.yaml
 
 # wait for canal pods
 kubectl wait --namespace kube-system \

kind/config/generate.sh

@@ -28,17 +28,18 @@ echo "# - KIND_ADMISSION_PLUGINS=${KIND_ADMISSION_PLUGINS}"
 # Allows to select Kubernetes Version, see:
 # - https://kind.sigs.k8s.io/docs/user/configuration/#kubernetes-version 
 # - https://github.com/kubernetes-sigs/kind/releases
-KIND_IMAGE=${KIND_IMAGE:-kindest/node:v1.32.8@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1}
+KIND_IMAGE=${KIND_IMAGE:-kindest/node:v1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2}
 
 # Allows to use another CNI like canal
 KIND_CNI=${KIND_CNI:-default}
 echo "# - KIND_CNI=${KIND_CNI}"
-if [ "$KIND_CNI" != "default" ] || [ "$KIND_CNI" != "disabled" ];
+if [ "$KIND_CNI" != "default" ] && [ "$KIND_CNI" != "disabled" ];
 then
-  DISABLE_DEFAULT_CNI=true
+  DISABLE_DEFAULT_CNI=1
 else
-  DISABLE_DEFAULT_CNI=false
+  DISABLE_DEFAULT_CNI=0
 fi
+echo "# - DISABLE_DEFAULT_CNI=${DISABLE_DEFAULT_CNI}"
 
 #----------------------------------------
 # Generate kind config
@@ -52,10 +53,15 @@ networking:
   ipFamily: ipv4
   apiServerAddress: "127.0.0.1"
   apiServerPort: 6443
+EOF
+if [ $DISABLE_DEFAULT_CNI == 1 ];
+then
+cat <<EOF
   podSubnet: "10.244.0.0/16"
   serviceSubnet: "10.96.0.0/12"
-  disableDefaultCNI: $DISABLE_DEFAULT_CNI
+  disableDefaultCNI: true
 EOF
+fi
 
 if [ ! -z "$DOCKERHUB_PROXY" ];
 then

kind/metallb-install.sh

@@ -2,7 +2,7 @@
 
 resources:
   # https://github.com/kubernetes-sigs/metrics-server/tags
-  - https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.7.2/components.yaml
+  - https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.8.0/components.yaml
 
 patches:
   - patch: |-