build: Add missing variables

.drone.yml

@@ -21,8 +21,8 @@ steps:
   - yamllint --version
 
 - name: Linting
-  depends_on:
+  # depends_on:
-  - Debugging information
+  # - Debugging information
   image: bv11-cr01.bessems.eu/library/packer-extended
   pull: always
   commands:
@@ -32,189 +32,157 @@ steps:
       packer/preseed/UbuntuServer22.04/user-data \
       scripts
 
-- name: Semantic Release (Dry-run)
+- name: Install Ansible Galaxy collections
-  depends_on:
+  # depends_on:
-  - Linting
+  # - Linting
-  image: bv11-cr01.bessems.eu/proxy/library/node:20-slim
+  image: bv11-cr01.bessems.eu/library/packer-extended
   pull: always
   commands:
   - |
-    apt-get update
+    ansible-galaxy collection install \
+      -r ansible/requirements.yml \
+      -p ./ansible/collections
+  volumes:
+  - name: scratch
+    path: /scratch
+
+- name: Kubernetes Bootstrap Appliance
+  # depends_on:
+  # - Install Ansible Galaxy collections
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  pull: always
+  commands:
   - |
-    apt-get install -y --no-install-recommends \
+    sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
-      git-core \
+      packer/preseed/UbuntuServer22.04/user-data
-      ca-certificates
   - |
-    npm install \
+    export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
-      semantic-release \
-      @semantic-release/commit-analyzer \
-      @semantic-release/release-notes-generator\
-      @semantic-release/exec
   - |
-    export GIT_CREDENTIALS=$${GIT_USERNAME}:$${GIT_APIKEY}
+    packer init -upgrade \
+      ./packer
   - |
-    npx semantic-release \
+    packer validate \
-      --branches ${DRONE_BRANCH} \
+      -only=vsphere-iso.bootstrap \
-      --plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator,@semantic-release/exec \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-      --dry-run
+      -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_password=$${DOCKER_PASSWORD} \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var k8s_version=$K8S_VERSION \
+      ./packer
+  - |
+    packer build \
+      -on-error=cleanup -timestamp-ui \
+      -only=vsphere-iso.bootstrap \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
+      -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_password=$${DOCKER_PASSWORD} \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var k8s_version=$K8S_VERSION \
+      ./packer
   environment:
-    GIT_APIKEY:
+    DOCKER_USERNAME:
-      from_secret: git_apikey
+      from_secret: docker_username
-    GIT_USERNAME: djpbessems
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    # PACKER_LOG: 1
+    REPO_USERNAME:
+      from_secret: repo_username
+    REPO_PASSWORD:
+      from_secret: repo_password
+    SSH_PASSWORD:
+      from_secret: ssh_password
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+  volumes:
+  - name: output
+    path: /output
+  - name: scratch
+    path: /scratch
 
-# Add random change for testing semantic release commit
+- name: Kubernetes Upgrade Appliance
-
-# - name: Install Ansible Galaxy collections
-#   depends_on:
-#   - Semantic Release (Dry-run)
-#   image: bv11-cr01.bessems.eu/library/packer-extended
-#   pull: always
-#   commands:
-#   - |
-#     ansible-galaxy collection install \
-#       -r ansible/requirements.yml \
-#       -p ./ansible/collections
-#   volumes:
-#   - name: scratch
-#     path: /scratch
-
-# - name: Kubernetes Bootstrap Appliance
   # depends_on:
   # - Install Ansible Galaxy collections
-#   image: bv11-cr01.bessems.eu/library/packer-extended
+  image: bv11-cr01.bessems.eu/library/packer-extended
-#   pull: always
+  pull: alwaysquery(
-#   commands:
+  commands:
-#   - |
+  - |
-#     sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
+    sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
-#       packer/preseed/UbuntuServer22.04/user-data
+      packer/preseed/UbuntuServer22.04/user-data
-#   - |
+  - |
-#     export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
+    export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
-#   - |
+  - |
-#     packer init -upgrade \
+    packer init -upgrade \
-#       ./packer
+      ./packer
-#   - |
+  - |
-#     packer validate \
+    packer validate \
-#       -only=vsphere-iso.bootstrap \
+      -only=vsphere-iso.upgrade \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
+      -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
+      -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
+      -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
+      -var k8s_version=$K8S_VERSION \
-#       ./packer
+      ./packer
-#   - |
+  - |
-#     packer build \
+    packer build \
-#       -on-error=cleanup -timestamp-ui \
+      -on-error=cleanup -timestamp-ui \
-#       -only=vsphere-iso.bootstrap \
+      -only=vsphere-iso.upgrade \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
+      -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
+      -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
+      -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
+      -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
+      -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
+      -var k8s_version=$K8S_VERSION \
-#       ./packer
+      ./packer
-#   environment:
+  environment:
-#     DOCKER_USERNAME:
+    DOCKER_USERNAME:
-#       from_secret: docker_username
+      from_secret: docker_username
-#     DOCKER_PASSWORD:
+    DOCKER_PASSWORD:
-#       from_secret: docker_password
+      from_secret: docker_password
-#     # PACKER_LOG: 1
+    # PACKER_LOG: 1
-#     REPO_USERNAME:
+    REPO_USERNAME:
-#       from_secret: repo_username
+      from_secret: repo_username
-#     REPO_PASSWORD:
+    REPO_PASSWORD:
-#       from_secret: repo_password
+      from_secret: repo_password
-#     SSH_PASSWORD:
+    SSH_PASSWORD:
-#       from_secret: ssh_password
+      from_secret: ssh_password
-#     VSPHERE_PASSWORD:
+    VSPHERE_PASSWORD:
-#       from_secret: vsphere_password
+      from_secret: vsphere_password
-#   volumes:
+  volumes:
-#   - name: output
+  - name: output
-#     path: /output
+    path: /output
-#   - name: scratch
+  - name: scratch
-#     path: /scratch
+    path: /scratch
 
-# - name: Kubernetes Upgrade Appliance
+- name: Remove temporary resources
-#   depends_on:
-#   - Install Ansible Galaxy collections
-#   image: bv11-cr01.bessems.eu/library/packer-extended
-#   pull: alwaysquery(
-#   commands:
-#   - |
-#     sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
-#       packer/preseed/UbuntuServer22.04/user-data
-#   - |
-#     export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
-#   - |
-#     packer init -upgrade \
-#       ./packer
-#   - |
-#     packer validate \
-#       -only=vsphere-iso.upgrade \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
-#       ./packer
-#   - |
-#     packer build \
-#       -on-error=cleanup -timestamp-ui \
-#       -only=vsphere-iso.upgrade \
-#       -var vm_name=${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:10}-$(openssl rand -hex 3) \
-#       -var docker_username=$${DOCKER_USERNAME} \
-#       -var docker_password=$${DOCKER_PASSWORD} \
-#       -var repo_username=$${REPO_USERNAME} \
-#       -var repo_password=$${REPO_PASSWORD} \
-#       -var ssh_password=$${SSH_PASSWORD} \
-#       -var vsphere_password=$${VSPHERE_PASSWORD} \
-#       -var k8s_version=$K8S_VERSION \
-#       ./packer
-#   environment:
-#     DOCKER_USERNAME:
-#       from_secret: docker_username
-#     DOCKER_PASSWORD:
-#       from_secret: docker_password
-#     # PACKER_LOG: 1
-#     REPO_USERNAME:
-#       from_secret: repo_username
-#     REPO_PASSWORD:
-#       from_secret: repo_password
-#     SSH_PASSWORD:
-#       from_secret: ssh_password
-#     VSPHERE_PASSWORD:
-#       from_secret: vsphere_password
-#   volumes:
-#   - name: output
-#     path: /output
-#   - name: scratch
-#     path: /scratch
-
-# - name: Remove temporary resources
   # depends_on:
   # - Kubernetes Bootstrap Appliance
   # - Kubernetes Upgrade Appliance
-#   image: bv11-cr01.bessems.eu/library/packer-extended
+  image: bv11-cr01.bessems.eu/library/packer-extended
-#   commands:
+  commands:
-#   - |
+  - |
-#     pwsh -file scripts/Remove-Resources.ps1 \
+    pwsh -file scripts/Remove-Resources.ps1 \
-#       -VMName $DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -VMName $DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
-#       -VSphereFQDN 'bv11-vc.bessems.lan' \
+      -VSphereFQDN 'bv11-vc.bessems.lan' \
-#       -VSphereUsername 'administrator@vsphere.local' \
+      -VSphereUsername 'administrator@vsphere.local' \
-#       -VSpherePassword $${VSPHERE_PASSWORD}
+      -VSpherePassword $${VSPHERE_PASSWORD}
-#   environment:
+  environment:
-#     VSPHERE_PASSWORD:
+    VSPHERE_PASSWORD:
-#       from_secret: vsphere_password
+      from_secret: vsphere_password
-#   volumes:
+  volumes:
-#   - name: scratch
+  - name: scratch
-#     path: /scratch
+    path: /scratch
-#   when:
+  when:
-#     status:
+    status:
-#     - success
+    - success
-#     - failure
+    - failure

ansible/roles/assets/tasks/manifests.yml

@@ -16,14 +16,16 @@
             { 'components': (
               metacluster_chartvalues |
               combine({ 'clusterapi': components.clusterapi }) |
-              combine({ 'kubevip'   : components.kubevip }) )
+              combine({ 'kubevip'   : components.kubevip }) ),
+              'appliance': {
+                'version': (applianceversion)
+              }
             } | to_nice_yaml(indent=2, width=4096)
           }}
 
     - name: Aggregate chart_values into dict
       ansible.builtin.set_fact:
         workloadcluster_chartvalues: "{{ workloadcluster_chartvalues | default({}) | combine({ item.key: { 'chart_values': (item.value.chart_values | default('') | from_yaml) } }) }}"
-      # when: item.value.chart_values is defined
       loop: "{{ query('ansible.builtin.dict', downstream.helm_charts) }}"
       loop_control:
         label: "{{ item.key }}"

ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/filter_plugins/netaddr.py

@@ -0,0 +1,14 @@
+import netaddr
+
+def netaddr_iter_iprange(ip_start, ip_end):
+    return [str(ip) for ip in netaddr.iter_iprange(ip_start, ip_end)]
+
+class FilterModule(object):
+        ''' Ansible filter. Interface to netaddr methods.
+            https://pypi.org/project/netaddr/
+        '''
+
+        def filters(self):
+            return {
+                'netaddr_iter_iprange': netaddr_iter_iprange
+            }

ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/json-server.yml

@@ -0,0 +1,27 @@
+- block:
+    - name: Install json-server chart
+      kubernetes.core.helm:
+        name: json-server
+        chart_ref: /opt/metacluster/helm-charts/json-server
+        release_namespace: json-server
+        create_namespace: true
+        wait: false
+        kubeconfig: "{{ kubeconfig.path }}"
+        values: "{{ components['json-server'].chart_values }}"
+
+    - name: Ensure json-server API availability
+      ansible.builtin.uri:
+        url: https://version.{{ vapp['metacluster.fqdn'] }}/healthz
+        method: GET
+      register: api_readycheck
+      until:
+        - api_readycheck.json.status is defined
+        - api_readycheck.json.status == 'running'
+      retries: "{{ playbook.retries }}"
+      delay: "{{ (storage_benchmark | int) * (playbook.delay.long | int) }}"
+
+  module_defaults:
+    ansible.builtin.uri:
+      validate_certs: no
+      status_code: [200, 201]
+      body_format: json

ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/metacluster/tasks/main.yml

@@ -1,5 +1,6 @@
 - import_tasks: init.yml
 - import_tasks: k3s.yml
+- import_tasks: json-server.yml
 - import_tasks: assets.yml
 - import_tasks: kube-vip.yml
 - import_tasks: storage.yml

ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2

@@ -3,8 +3,8 @@ kind: Kustomization
 resources:
 - cluster-template.yaml
 
-patchesStrategicMerge:
+patches:
-  - |-
+- patch: |-
     apiVersion: v1
     kind: Secret
     metadata:
@@ -32,7 +32,7 @@ patchesStrategicMerge:
             [Network]
             public-network = "${VSPHERE_NETWORK}"
         type: Opaque
-  - |-
+- patch: |-
     apiVersion: controlplane.cluster.x-k8s.io/v1beta1
     kind: KubeadmControlPlane
     metadata:
@@ -42,7 +42,7 @@ patchesStrategicMerge:
       kubeadmConfigSpec:
         clusterConfiguration:
           imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
-  - |-
+- patch: |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -53,7 +53,7 @@ patchesStrategicMerge:
         spec:
           clusterConfiguration:
             imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
-  - |-
+- patch: |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -86,7 +86,7 @@ patchesStrategicMerge:
               {{ _template.rootca | indent(width=14, first=False) | trim }}
             owner: root:root
             path: /usr/local/share/ca-certificates/root_ca.crt
-  - |-
+- patch: |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -105,7 +105,7 @@ patchesStrategicMerge:
               nameservers:
               - {{ _template.network.dnsserver }}
               networkName: '${VSPHERE_NETWORK}'
-  - |-
+- patch: |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -125,7 +125,6 @@ patchesStrategicMerge:
               - {{ _template.network.dnsserver }}
               networkName: '${VSPHERE_NETWORK}'
 
-patchesJson6902:
 - target:
     group: controlplane.cluster.x-k8s.io
     version: v1beta1
@@ -164,7 +163,7 @@ patchesJson6902:
       path: /spec/kubeadmConfigSpec/files/-
       value:
         content: |
-            {{ _template.rootca | indent(width=12, first=False) | trim }}
+          {{ _template.rootca | indent(width=10, first=False) | trim }}
         owner: root:root
         path: /usr/local/share/ca-certificates/root_ca.crt
 - target:

ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.nodepool.j2

@@ -5,8 +5,8 @@ resources:
 - manifests/machinedeployment-{{ _template.cluster.name }}-worker.yaml
 - manifests/vspheremachinetemplate-{{ _template.cluster.name }}-worker.yaml
 
-patchesStrategicMerge:
+patches:
-  - |-
+- patch: |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -31,7 +31,7 @@ patchesStrategicMerge:
           mounts:
           - - LABEL=blockstorage
             - /mnt/blockstorage
-  - |-
+- patch: |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -43,7 +43,6 @@ patchesStrategicMerge:
           additionalDisksGiB:
           - {{ _template.nodepool.additionaldisk }}
 
-patchesJson6902:
 - target:
     group: bootstrap.cluster.x-k8s.io
     version: v1beta1

ansible/vars/metacluster.yml

@@ -1,7 +1,7 @@
 platform:
 
   k3s:
-    version: v1.25.9+k3s1
+    version: v1.27.1+k3s1
 
   packaged_components:
     - name: traefik
@@ -51,6 +51,8 @@ platform:
       url: https://prometheus-community.github.io/helm-charts
     - name: smallstep
       url: https://smallstep.github.io/helm-charts/
+    - name: spamasaurus
+      url: https://code.spamasaurus.com/api/packages/djpbessems/helm
 
 components:
 
@@ -115,13 +117,13 @@ components:
         infrastructure_vsphere: v1.6.0
         ipam_incluster: v0.1.0-alpha.2
         # Refer to `https://console.cloud.google.com/gcr/images/cloud-provider-vsphere/GLOBAL/cpi/release/manager` for available tags
-        cpi_vsphere: v1.25.2
+        cpi_vsphere: v1.26.1
     workload:
       version:
         calico: v3.25.0
-        k8s: v1.25.9
+        k8s: v1.27.1
       node_template:
-        url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.25.9.ova
+        url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.27.1.ova
 
   # dex:
   #   helm:
@@ -225,6 +227,34 @@ components:
             registry:
               size: 25Gi
 
+  json-server:
+    helm:
+      version: v0.5.1
+      chart: spamasaurus/json-server
+      parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /'
+      chart_values: !unsafe |
+        ingress:
+          enabled: true
+          hosts:
+            - host: version.{{ vapp['metacluster.fqdn'] }}
+              paths:
+                - path: /
+                  pathType: Prefix
+        seedData:
+          configInline: |
+            {
+              "appliance": { "version": "{{ appliance.version }}" },
+              "components": [
+                { "app": "argo-cd", "version": "{{ components[argo-cd].helm.version }}" },
+                { "app": "cert-manager", "version": "{{ components[cert-manager].helm.version }}" },
+                { "app": "cluster-api",
+                  "management": { "foo": "bar" },
+                  "workload": { "foo": "bar" }
+                }
+              ],
+              "healthz": { "status": "running" }
+            }
+
   # keycloakx:
   #   helm:
   #     version: 2.1.1  # (= Keycloak 20.0.3)

packer/build.pkr.hcl

@@ -28,6 +28,7 @@ build {
 
     extra_arguments  = [
       "--extra-vars", "appliancetype=${source.name}",
+      "--extra-vars", "applianceversion=${var.appliance_version}",
       "--extra-vars", "ansible_ssh_pass=${var.ssh_password}",
       "--extra-vars", "docker_username=${var.docker_username}",
       "--extra-vars", "docker_password=${var.docker_password}",

packer/variables.pkr.hcl

@@ -34,4 +34,5 @@ variable "docker_password" {
     sensitive = true
 }
 
+variable "appliance_version" {}
 variable "k8s_version" {}