New version in config

gpillon · Dec 8, 2024 · 1931f08 · 1931f08
1 parent e499942
commit 1931f08
Show file tree

Hide file tree

Showing 52 changed files with 68 additions and 4 deletions.
diff --git a/data/default-cluster-config.json b/data/default-cluster-config.json
@@ -1,7 +1,7 @@
 // This file is used to configure the device.
 // The device will read this fle and apply the settings during boot.
 {
-  "version": "1.5.1",
+  "version": "1.5.5",
   "networking": {
     //default_cni (calico cilium)
     "cni": {

diff --git a/install-scripts/cleanup-lvm-coreos.sh b/install-scripts/cleanup-lvm-coreos.sh
diff --git a/install-scripts/cleanup-lvm-volumes.sh b/install-scripts/cleanup-lvm-volumes.sh
diff --git a/install-scripts/edit-disk.sh b/install-scripts/edit-disk.sh
diff --git a/install-scripts/edit_config_startup.sh b/install-scripts/edit_config_startup.sh
diff --git a/install-scripts/edit_network.sh b/install-scripts/edit_network.sh
diff --git a/install-scripts/eject-reboot.sh b/install-scripts/eject-reboot.sh
diff --git a/install-scripts/include_config.sh b/install-scripts/include_config.sh
diff --git a/install-scripts/install-coreos.sh b/install-scripts/install-coreos.sh
diff --git a/install-scripts/k4all-config.sh b/install-scripts/k4all-config.sh
diff --git a/install-scripts/post-install.sh b/install-scripts/post-install.sh
diff --git a/install-scripts/pre-install.sh b/install-scripts/pre-install.sh
diff --git a/install-scripts/unmount-lvm-coreos.sh b/install-scripts/unmount-lvm-coreos.sh
diff --git a/install-scripts/validate_config.sh b/install-scripts/validate_config.sh
diff --git a/install-scripts/validator/disk.sh b/install-scripts/validator/disk.sh
diff --git a/install-scripts/validator/features.sh b/install-scripts/validator/features.sh
diff --git a/install-scripts/validator/networking.sh b/install-scripts/validator/networking.sh
diff --git a/install-scripts/validator/node.sh b/install-scripts/validator/node.sh
diff --git a/install-scripts/validator/utils.sh b/install-scripts/validator/utils.sh
diff --git a/overrides/bootstrap/k8s-config-bootstrap.yaml b/overrides/bootstrap/k8s-config-bootstrap.yaml
@@ -12,4 +12,62 @@ apiVersion: kubeadm.k8s.io/v1beta3
 kind: InitConfiguration
 nodeRegistration:
   kubeletExtraArgs:
-    volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
+    volume-plugin-dir: "/opt/libexec/kubernetes/kubelet-plugins/volume/exec/"
+
+# apiVersion: kubeadm.k8s.io/v1beta4
+# bootstrapTokens:
+# - groups:
+#   - system:bootstrappers:kubeadm:default-node-token
+#   token: ek4cg4.i9dc6iptft628qja
+#   ttl: 24h0m0s
+#   usages:
+#   - signing
+#   - authentication
+# kind: InitConfiguration
+# localAPIEndpoint:
+#   advertiseAddress: 192.168.5.98
+#   bindPort: 6443
+# nodeRegistration:
+#   criSocket: unix:///var/run/crio/crio.sock
+#   imagePullPolicy: IfNotPresent
+#   imagePullSerial: true
+#   kubeletExtraArgs:
+#   - name: volume-plugin-dir
+#     value: /opt/libexec/kubernetes/kubelet-plugins/volume/exec/
+#   name: kube-bootstrap-6hcib.farm.local
+#   taints:
+#   - effect: NoSchedule
+#     key: node-role.kubernetes.io/control-plane
+# timeouts:
+#   controlPlaneComponentHealthCheck: 4m0s
+#   discovery: 5m0s
+#   etcdAPICall: 2m0s
+#   kubeletHealthCheck: 4m0s
+#   kubernetesAPICall: 1m0s
+#   tlsBootstrap: 5m0s
+#   upgradeManifests: 5m0s
+# ---
+# apiServer: {}
+# apiVersion: kubeadm.k8s.io/v1beta4
+# caCertificateValidityPeriod: 87600h0m0s
+# certificateValidityPeriod: 8760h0m0s
+# certificatesDir: /etc/kubernetes/pki
+# clusterName: kubernetes
+# controllerManager:
+#   extraArgs:
+#   - name: flex-volume-plugin-dir
+#     value: /opt/libexec/kubernetes/kubelet-plugins/volume/exec/
+# dns: {}
+# encryptionAlgorithm: RSA-2048
+# etcd:
+#   local:
+#     dataDir: /var/lib/etcd
+# imageRepository: registry.k8s.io
+# kind: ClusterConfiguration
+# kubernetesVersion: v1.31.3
+# networking:
+#   dnsDomain: cluster.local
+#   podSubnet: 10.100.0.1/18
+#   serviceSubnet: 10.96.0.0/16
+# proxy: {}
+# scheduler: {}
diff --git a/overrides/worker/setup-k8s-ph3.sh b/overrides/worker/setup-k8s-ph3.sh
@@ -9,4 +9,6 @@ fi
 
 # nothing to do ATM on workers
 
-touch /opt/k4all/setup-ph3.done
+touch /opt/k4all/setup-ph3.done
+
+systemctl reboot
diff --git a/scripts/check-ip.sh b/scripts/check-ip.sh
diff --git a/scripts/disk-helper.sh b/scripts/disk-helper.sh
diff --git a/scripts/install-status.sh b/scripts/install-status.sh
diff --git a/scripts/k4all-utils b/scripts/k4all-utils
diff --git a/scripts/node-ready-and-schedulable.sh b/scripts/node-ready-and-schedulable.sh
diff --git a/scripts/prune-bootstrap-tokens.sh b/scripts/prune-bootstrap-tokens.sh
diff --git a/scripts/reinstall.sh b/scripts/reinstall.sh
diff --git a/scripts/set-hostname.sh b/scripts/set-hostname.sh
diff --git a/scripts/set-static-ip.sh b/scripts/set-static-ip.sh
diff --git a/scripts/setup-certmanager.sh b/scripts/setup-certmanager.sh
diff --git a/scripts/setup-cni-calico.sh b/scripts/setup-cni-calico.sh
diff --git a/scripts/setup-cni-cilium.sh b/scripts/setup-cni-cilium.sh
diff --git a/scripts/setup-cni.sh b/scripts/setup-cni.sh
diff --git a/scripts/setup-custom-manifests.sh b/scripts/setup-custom-manifests.sh
diff --git a/scripts/setup-dashboard.sh b/scripts/setup-dashboard.sh
diff --git a/scripts/setup-feature-argocd.sh b/scripts/setup-feature-argocd.sh
diff --git a/scripts/setup-feature-virt.sh b/scripts/setup-feature-virt.sh
diff --git a/scripts/setup-features.sh b/scripts/setup-features.sh
diff --git a/scripts/setup-helm.sh b/scripts/setup-helm.sh
diff --git a/scripts/setup-ingress.sh b/scripts/setup-ingress.sh
diff --git a/scripts/setup-k8s-ph1.sh b/scripts/setup-k8s-ph1.sh
diff --git a/scripts/setup-k8s-ph2.sh b/scripts/setup-k8s-ph2.sh
@@ -86,7 +86,6 @@ if [ "$CURRENT_IP_CONFIG" = "static" ]; then
   modify_nmcli_connection_if_needed ovs-bridge-int ipv4.gateway "${GATEWAY}"
   modify_nmcli_connection_if_needed ovs-bridge-int ipv4.dns "${DNS}"
   modify_nmcli_connection_if_needed ovs-bridge-int ipv4.dns-search "${DNS_SEARCH}"
-  modify_nmcli_connection_if_needed ovs-bridge-int ethernet.mac-address "${MAC_ADDR}"
 
 else
   # echo "WARNING! this should not happen...."
@@ -99,6 +98,9 @@ else
   modify_nmcli_connection_if_needed ovs-bridge-int ipv4.method auto
 fi
 
+ modify_nmcli_connection_if_needed ovs-bridge-int ethernet.cloned-mac-address "${MAC_ADDR}"
+ # modify_nmcli_connection_if_needed ovs-port-eth-int ethernet.cloned-mac-address "${MAC_ADDR}"
+
 # Bring up the ovs-port-eth-int and ovs-bridge-int connections
 nmcli con up ovs-port-eth-int
 nmcli con up ovs-bridge-int
@@ -187,6 +189,8 @@ if systemctl is-enabled --quiet firewalld; then
   firewall-cmd --reload
 fi
 
+systemctl restart NetworkManager
+
 # Mark the setup phase as done
 touch /opt/k4all/setup-ph2.done
 

diff --git a/scripts/setup-lvm.sh b/scripts/setup-lvm.sh
diff --git a/scripts/setup-metallb.sh b/scripts/setup-metallb.sh
diff --git a/scripts/setup-metrics.sh b/scripts/setup-metrics.sh
diff --git a/scripts/setup-ovs-cni.sh b/scripts/setup-ovs-cni.sh
diff --git a/scripts/setup-taint-master-scheduleable.sh b/scripts/setup-taint-master-scheduleable.sh
diff --git a/scripts/setup-topolvm.sh b/scripts/setup-topolvm.sh
diff --git a/scripts/update-node.sh b/scripts/update-node.sh
diff --git a/scripts/update-routes.sh b/scripts/update-routes.sh
diff --git a/scripts/wait-default-service-account.sh b/scripts/wait-default-service-account.sh