Small fixes for calico, they do start, run but not fully work because of

double adapters.

2024/07/k8s_scratch_demo1/.gitignore

@@ -0,0 +1,2 @@
+*.secret
+*~

2024/07/k8s_scratch_demo1/master/Vagrantfile

@@ -16,7 +16,7 @@ Vagrant.configure("2") do |config|
 
 
   config.vm.hostname = "master.local"
-  config.vm.network :public_network, ip: "10.1.0.2"
+  config.vm.network :public_network, ip: "10.96.0.1", bridge: "Wireless LAN adapter Wi-Fi"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -77,17 +77,18 @@ end
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
-    grep "master.local" /etc/hosts || cat /vagrant/hosts.txt >> /etc/hosts
-    test -f init.log || \\
-     ( kubeadm init --control-plane-endpoint master.local:6443 --pod-network-cidr 10.2.0.0/22 | tee init.log )
+    echo "Initializing k8s..."
+    test -f /vagrant/init.log || \\
+     ( kubeadm init --v=5 --node-name 10.96.0.1 --control-plane-endpoint 10.96.0.1:6443 --apiserver-advertise-address 10.96.0.1 --apiserver-bind-port 6443 --pod-network-cidr 10.96.0.0/22 | tee /vagrant/init.log )
     export KUBECONFIG=/etc/kubernetes/admin.conf
+    echo "Fetching tigera operator..."
     test -f tigera-operator.yaml || ( wget https://raw.githubusercontent.com/projectcalico/calico/v3.27.0/manifests/tigera-operator.yaml \\
       && kubectl create -f tigera-operator.yaml ) 
-    test -f custom-resources.yaml || wget https://raw.githubusercontent.com/projectcalico/calico/v3.27.0/manifests/custom-resources.yaml
-    sed -i.bak -E "s#cidr.*#cidr: 10\.2\.0\.0/22#g" custom-resources.yaml
-    kubectl apply -f custom-resources.yaml
-    grep "\-\-token" sample.txt | awk '{ print ($5) }' | tail -n 1 >> /vagrant/token.secret
-    grep "discovery:" init.log | awk '{print($2)}' | tail -n 1 >> /vagrant/discovery.secret
-    cat init.log
+    echo "Fetching custom resources"
+    kubectl apply -f /vagrant/custom-resources.yaml
+    echo "Parsing init.log..."
+    grep "10\.96\.0\.1" /vagrant/init.log | awk '{ print ($5) }' | tail -n 1 | tee /vagrant/token.secret
+    grep "discovery-" /vagrant/init.log | awk '{print($2)}' | tail -n 1 | tee /vagrant/discovery.secret
+    cat /vagrant/init.log
   SHELL
 end

2024/07/k8s_scratch_demo1/master/custom-resources.yaml

@@ -0,0 +1,30 @@
+# This section includes base Calico installation configuration.
+# 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:
+    nodeAddressAutodetectionV4:
+      cidrs:
+        - '10.96.0.0/22'
+    # Note: The ipPools section cannot be modified post-install.
+    ipPools:
+    - blockSize: 26
+      cidr: 10.96.0.0/22
+      encapsulation: VXLANCrossSubnet
+      natOutgoing: Enabled
+      nodeSelector: all()
+
+---
+
+# This section configures the Calico API server.
+# 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: {}
+

2024/07/k8s_scratch_demo1/master/hosts.txt

@@ -1,4 +0,0 @@
-10.1.0.2        master.local
-10.1.0.3        worker1.local
-10.1.0.4        worker2.local
-10.1.0.5        worker3.local

2024/07/k8s_scratch_demo1/worker/Vagrantfile

@@ -16,7 +16,7 @@ Vagrant.configure("2") do |config|
 
 
   config.vm.hostname = "worker.local"
-  config.vm.network :public_network, ip: "10.1.0.3"
+  config.vm.network :public_network, ip: "10.96.0.2"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -77,7 +77,6 @@ end
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
     apt-get update
-    grep "master.local" /etc/hosts || cat /vagrant/hosts.txt >> /etc/hosts
-    kubeadm join master.local:6443 --token $(cat /vagrant/token.secret) --discovery-token-ca-cert-hash $(cat /vagrant/discovery.secret)
+    kubeadm join --v=5 10.96.0.1:6443 --token $(cat /vagrant/token.secret) --discovery-token-ca-cert-hash $(cat /vagrant/discovery.secret)
   SHELL
 end

2024/07/k8s_scratch_demo1/worker/hosts.txt

@@ -1,4 +0,0 @@
-10.1.0.2        master.local
-10.1.0.3        worker1.local
-10.1.0.4        worker2.local
-10.1.0.5        worker3.local