Settle on v1 setup method. Test run completed successfully from bootstrap to service setup.

- Refactor dnsmasq configuration and scripts for improved variable handling and clarity
- Updated dnsmasq configuration files to use direct variable references instead of data source functions for better readability.
- Modified setup scripts to ensure they are run from the correct environment and directory, checking for the WC_HOME variable.
- Changed paths in README and scripts to reflect the new directory structure.
- Enhanced error handling in setup scripts to provide clearer guidance on required configurations.
- Adjusted kernel and initramfs URLs in boot.ipxe to use the updated variable references.

setup/cluster/docker-registry/config/example.env

@@ -1,2 +0,0 @@
-DOCKER_REGISTRY_STORAGE=10Gi
-DOCKER_REGISTRY_HOST=docker-registry.$INTERNAL_DOMAIN

setup/cluster/docker-registry/install.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+
+if [ -z "${WC_HOME}" ]; then
+    echo "Please source the wildcloud environment first. (e.g., \`source ./env.sh\`)"
+    exit 1
+fi
+
+CLUSTER_SETUP_DIR="${WC_HOME}/setup/cluster"
+DOCKER_REGISTRY_DIR="${CLUSTER_SETUP_DIR}/docker-registry"
+
+echo "Setting up Docker Registry..."
+
+# Process templates with wild-compile-template-dir
+echo "Processing Docker Registry templates..."
+wild-compile-template-dir --clean ${DOCKER_REGISTRY_DIR}/kustomize.template ${DOCKER_REGISTRY_DIR}/kustomize
+
+# Apply the docker registry manifests using kustomize
+kubectl apply -k "${DOCKER_REGISTRY_DIR}/kustomize"
+
+echo "Waiting for Docker Registry to be ready..."
+kubectl wait --for=condition=available --timeout=300s deployment/docker-registry -n docker-registry
+
+echo "Docker Registry setup complete!"
+
+# Show deployment status
+kubectl get pods -n docker-registry
+kubectl get services -n docker-registry

setup/cluster/docker-registry/kustomization.yaml

@@ -1,40 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: docker-registry
-labels:
-  - includeSelectors: true
-    pairs:
-      app: docker-registry
-      managedBy: wild-cloud
-resources:
-  - deployment.yaml
-  - ingress.yaml
-  - service.yaml
-  - namespace.yaml
-  - pvc.yaml
-configMapGenerator:
-  - name: docker-registry-config
-    envs:
-      - config/config.env
-replacements:
-  - source:
-      kind: ConfigMap
-      name: docker-registry-config
-      fieldPath: data.DOCKER_REGISTRY_STORAGE
-    targets:
-      - select:
-          kind: PersistentVolumeClaim
-          name: docker-registry-pvc
-        fieldPaths:
-          - spec.resources.requests.storage
-  - source:
-      kind: ConfigMap
-      name: docker-registry-config
-      fieldPath: data.DOCKER_REGISTRY_HOST
-    targets:
-      - select:
-          kind: Ingress
-          name: docker-registry
-        fieldPaths:
-          - spec.rules.0.host
-          - spec.tls.0.hosts.0

setup/cluster/docker-registry/kustomize.template/ingress.yaml

@@ -4,7 +4,7 @@ metadata:
   name: docker-registry
 spec:
   rules:
-    - host: docker-registry.internal.${DOMAIN}
+    - host: {{ .cloud.dockerRegistryHost }}
       http:
         paths:
           - path: /
@@ -16,5 +16,5 @@ spec:
                   number: 5000
   tls:
     - hosts:
-        - docker-registry.internal.${DOMAIN}
+        - {{ .cloud.dockerRegistryHost }}
       secretName: wildcard-internal-wild-cloud-tls

setup/cluster/docker-registry/kustomize.template/kustomization.yaml

@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: docker-registry
+labels:
+  - includeSelectors: true
+    pairs:
+      app: docker-registry
+      managedBy: wild-cloud
+resources:
+  - deployment.yaml
+  - ingress.yaml
+  - service.yaml
+  - namespace.yaml
+  - pvc.yaml

setup/cluster/docker-registry/kustomize.template/pvc.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: docker-registry-pvc
+spec:
+  storageClassName: longhorn
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: {{ .cluster.dockerRegistry.storage }}

setup/cluster/docker-registry/kustomize/deployment.yaml

@@ -0,0 +1,36 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: docker-registry
+  labels:
+    app: docker-registry    
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: docker-registry
+  strategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: docker-registry
+    spec:
+      containers:
+        - image: registry:3.0.0
+          name: docker-registry
+          ports:
+            - containerPort: 5000
+              protocol: TCP
+          volumeMounts:
+            - mountPath: /var/lib/registry
+              name: docker-registry-storage
+              readOnly: false
+      volumes:
+        - name: docker-registry-storage
+          persistentVolumeClaim:
+            claimName: docker-registry-pvc

setup/cluster/docker-registry/kustomize/ingress.yaml

@@ -0,0 +1,20 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: docker-registry
+spec:
+  rules:
+    - host: docker-registry.internal.cloud2.payne.io
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: docker-registry
+                port:
+                  number: 5000
+  tls:
+    - hosts:
+        - docker-registry.internal.cloud2.payne.io
+      secretName: wildcard-internal-wild-cloud-tls

setup/cluster/docker-registry/kustomize/kustomization.yaml

@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: docker-registry
+labels:
+  - includeSelectors: true
+    pairs:
+      app: docker-registry
+      managedBy: wild-cloud
+resources:
+  - deployment.yaml
+  - ingress.yaml
+  - service.yaml
+  - namespace.yaml
+  - pvc.yaml

setup/cluster/docker-registry/kustomize/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: docker-registry

setup/cluster/docker-registry/kustomize/service.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: docker-registry
+  labels:
+    app: docker-registry
+spec:
+  ports:
+    - port: 5000
+      targetPort: 5000
+  selector:
+    app: docker-registry