Merge pull request #19 from mkm29/develop

Develop

Author: mkm29

README.md

@@ -361,8 +361,8 @@ wget -qO - 'https://proget.makedeb.org/debian-feeds/prebuilt-mpr/pool/just_1.14.
 brew install sops
 
 # Linux
-wget https://github.com/mozilla/sops/releases/download/v3.8.1/sops-v3.8.1.linux.amd64
-sudo mv sops-v3.8.1.linux.amd64 /usr/local/bin/sops
+wget https://github.com/mozilla/sops/releases/download/v3.10.2/sops-v3.10.2.linux.amd64
+sudo mv sops-v3.10.2.linux.amd64 /usr/local/bin/sops
 sudo chmod +x /usr/local/bin/sops
 ```
 

infrastructure/k3d/config/calico.yaml

@@ -15,6 +15,10 @@ ports:
       - loadbalancer
 options:
   k3s:
+    nodeLabels:
+      - label: kubernetes.io/role=worker
+        nodeFilters:
+          - agent:*
     extraArgs:
       # Disable default k3s network components to use Calico
       - arg: --flannel-backend=none

infrastructure/k3d/config/cilium.yaml

@@ -33,7 +33,7 @@ options:
       - arg: --disable=traefik
         nodeFilters:
           - server:*
-      - arg: --disable servicelb
+      - arg: --disable=servicelb
         nodeFilters:
           - server:*
       - arg: --disable-kube-proxy

infrastructure/k3d/registries.yaml renamed to infrastructure/k3d/config/registries.yaml

@@ -26,7 +26,7 @@ default:
 decrypt-sops:
     @echo "Decrypting SOPS environment file..."
     @if [ ! -f .secrets.enc.env ]; then \
-        echo "Error: .secrets.env file not found"; \
+        echo "Error: .secrets.enc.env file not found"; \
         exit 1; \
     fi
     @if ! command -v sops > /dev/null 2>&1; then \
@@ -43,13 +43,13 @@ process-registries:
         exit 1; \
     fi
     @export $(cat .secrets.env | xargs) && \
-        envsubst < infrastructure/k3d/registries.yaml > infrastructure/k3d/registries-processed.yaml
-    @echo "Processed registries saved to infrastructure/k3d/registries-processed.yaml"
+        envsubst < infrastructure/k3d/config/registries.yaml > infrastructure/k3d/config/registries-processed.yaml
+    @echo "Processed registries saved to infrastructure/k3d/config/registries-processed.yaml"
 
 # Clean up temporary files
 cleanup-temp:
     @echo "Cleaning up temporary files..."
-    @rm -f .secrets.env infrastructure/k3d/registries-processed.yaml
+    @rm -f .secrets.env infrastructure/k3d/config/registries-processed.yaml
     @echo "Temporary files removed."
 
 # Run preflight checks
@@ -89,7 +89,7 @@ preflight:
 # Create a k3d cluster (use K3D_CONFIG env var to specify config file)
 create-cluster: preflight decrypt-sops process-registries
     @echo "Creating k3d cluster with config: {{k3d_config}}..."
-    @k3d cluster create {{cluster_name}} --config {{k3d_config}} --registry-config infrastructure/k3d/registries-processed.yaml
+    @k3d cluster create {{cluster_name}} --config {{k3d_config}} --registry-config infrastructure/k3d/config/registries-processed.yaml
     @echo "Cluster {{cluster_name}} created successfully."
 
 # Patch nodes to mount BPF filesystem
@@ -240,7 +240,7 @@ status:
 
 # Test connectivity (works for both Cilium and Calico)
 test-connectivity:
-    @if [[ "{{cni_type}}" = "cilium " ]]; then \
+    @if [[ "{{cni_type}}" = "cilium" ]]; then \
         echo "Running Cilium connectivity test..."; \
         cilium connectivity test; \
     elif [[ "{{cni_type}}" = "calico" ]]; then \