build: Revert to semi-working syntax

.drone.yml

@@ -10,6 +10,11 @@ volumes:
   claim:
     name: flexvolsmb-drone-scratch
 
+trigger:
+  event:
+    exclude:
+    - tag
+
 steps:
 - name: Debugging information
   image: bv11-cr01.bessems.eu/library/packer-extended
@@ -32,9 +37,44 @@ steps:
       packer/preseed/UbuntuServer22.04/user-data \
       scripts
 
-- name: Install Ansible Galaxy collections
+- name: Semantic Release (Dry-run)
   depends_on:
   - Linting
+  image: bv11-cr01.bessems.eu/proxy/library/node:20-slim
+  pull: always
+  commands:
+  - |
+    apt-get update
+  - |
+    apt-get install -y --no-install-recommends \
+      git-core \
+      ca-certificates
+  - |
+    npm install \
+      semantic-release \
+      @semantic-release/commit-analyzer \
+      @semantic-release/exec \
+  - |
+    export GIT_CREDENTIALS=$${GIT_USERNAME}:$${GIT_APIKEY}
+  - |
+    npx semantic-release \
+      --package @semantic-release/exec \
+      --package semantic-release \
+      --branches ${DRONE_BRANCH} \
+      --tag-format "K8s_1.25.9-v\$${version}" \
+      --dry-run \
+      --plugins @semantic-release/commit-analyzer,@semantic-release/exec \
+      --analyzeCommits @semantic-release/commit-analyzer \
+      --verifyRelease @semantic-release/exec \
+      --verifyReleaseCmd 'echo "$${nextRelease.version}" > .version'
+  environment:
+    GIT_APIKEY:
+      from_secret: git_apikey
+    GIT_USERNAME: djpbessems
+
+- name: Install Ansible Galaxy collections
+  depends_on:
+  - Semantic Release (Dry-run)
   image: bv11-cr01.bessems.eu/library/packer-extended
   pull: always
   commands:
@@ -42,9 +82,6 @@ steps:
     ansible-galaxy collection install \
       -r ansible/requirements.yml \
       -p ./ansible/collections
-  volumes:
-  - name: scratch
-    path: /scratch
 
 - name: Kubernetes Bootstrap Appliance
   depends_on:
@@ -57,6 +94,7 @@ steps:
       packer/preseed/UbuntuServer22.04/user-data
   - |
     export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
+    export NEXT_RELEASE_VERSION=$(cat .version)
   - |
     packer init -upgrade \
       ./packer
@@ -71,6 +109,7 @@ steps:
       -var ssh_password=$${SSH_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \
       -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
       ./packer
   - |
     packer build \
@@ -84,6 +123,7 @@ steps:
       -var ssh_password=$${SSH_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \
       -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
       ./packer
   environment:
     DOCKER_USERNAME:
@@ -116,6 +156,7 @@ steps:
       packer/preseed/UbuntuServer22.04/user-data
   - |
     export K8S_VERSION=$(yq '.components.clusterapi.workload.version.k8s' < ./ansible/vars/metacluster.yml)
+    export NEXT_RELEASE_VERSION=$(cat .version)
   - |
     packer init -upgrade \
       ./packer
@@ -130,6 +171,7 @@ steps:
       -var ssh_password=$${SSH_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \
       -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
       ./packer
   - |
     packer build \
@@ -143,6 +185,7 @@ steps:
       -var ssh_password=$${SSH_PASSWORD} \
       -var vsphere_password=$${VSPHERE_PASSWORD} \
       -var k8s_version=$K8S_VERSION \
+      -var next_release_version=$NEXT_RELEASE_VERSION \
       ./packer
   environment:
     DOCKER_USERNAME:

.releaserc.json.DISABLED

@@ -0,0 +1,11 @@
+{
+    "plugins": [
+        ["@semantic-release/commit-analyzer"],
+        ["@semantic-release/release-notes-generator"],
+        ["@semantic-release/exec", {
+            "prepareCmd": "export SEMANTICRELEASE_NEXTRELEASEVERSION=${nextRelease.version}",
+            "publishCmd": "echo $SEMANTICRELEASE_NEXTRELEASEVERSION"
+        }],
+        ["@semantic-release/git"]
+    ]
+}

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

@@ -3,8 +3,8 @@ kind: Kustomization
 resources:
 - cluster-template.yaml
 
-patches:
-- patch: |-
+patchesStrategicMerge:
+  - |-
     apiVersion: v1
     kind: Secret
     metadata:
@@ -32,7 +32,7 @@ patches:
             [Network]
             public-network = "${VSPHERE_NETWORK}"
         type: Opaque
-- patch: |-
+  - |-
     apiVersion: controlplane.cluster.x-k8s.io/v1beta1
     kind: KubeadmControlPlane
     metadata:
@@ -42,7 +42,7 @@ patches:
       kubeadmConfigSpec:
         clusterConfiguration:
           imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
-- patch: |-
+  - |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -53,7 +53,7 @@ patches:
         spec:
           clusterConfiguration:
             imageRepository: registry.{{ _template.network.fqdn }}/kubeadm
-- patch: |-
+  - |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -86,7 +86,7 @@ patches:
               {{ _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 @@ patches:
               nameservers:
               - {{ _template.network.dnsserver }}
               networkName: '${VSPHERE_NETWORK}'
-- patch: |-
+  - |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -125,131 +125,132 @@ patches:
               - {{ _template.network.dnsserver }}
               networkName: '${VSPHERE_NETWORK}'
 
-- target:
-    group: controlplane.cluster.x-k8s.io
-    version: v1beta1
-    kind: KubeadmControlPlane
-    name: .*
-  patch: |-
-    - op: add
-      path: /spec/kubeadmConfigSpec/files/-
-      value:
-        content: |
-            [plugins."io.containerd.grpc.v1.cri".registry]
-              config_path = "/etc/containerd/certs.d"
-        append: true
-        path: /etc/containerd/config.toml
+patchesJson6902:
+  - target:
+      group: controlplane.cluster.x-k8s.io
+      version: v1beta1
+      kind: KubeadmControlPlane
+      name: .*
+    patch: |-
+      - op: add
+        path: /spec/kubeadmConfigSpec/files/-
+        value:
+          content: |
+              [plugins."io.containerd.grpc.v1.cri".registry]
+                config_path = "/etc/containerd/certs.d"
+          append: true
+          path: /etc/containerd/config.toml
 {% for registry in _template.registries %}
-    - op: add
-      path: /spec/kubeadmConfigSpec/files/-
-      value:
-        content: |
-          server = "https://{{ registry }}"
+      - op: add
+        path: /spec/kubeadmConfigSpec/files/-
+        value:
+          content: |
+            server = "https://{{ registry }}"
 
-          [host."https://registry.{{ _template.network.fqdn }}/v2/library/{{ registry }}"]
-            capabilities = ["pull", "resolve"]
-            override_path = true
-        owner: root:root
-        path: /etc/containerd/certs.d/{{ registry }}/hosts.toml
+            [host."https://registry.{{ _template.network.fqdn }}/v2/library/{{ registry }}"]
+              capabilities = ["pull", "resolve"]
+              override_path = true
+          owner: root:root
+          path: /etc/containerd/certs.d/{{ registry }}/hosts.toml
 {% endfor %}
-    - op: add
-      path: /spec/kubeadmConfigSpec/files/-
-      value:
-        content: |
-          network: {config: disabled}
-        owner: root:root
-        path: /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
-    - op: add
-      path: /spec/kubeadmConfigSpec/files/-
-      value:
-        content: |
-          {{ _template.rootca | indent(width=10, first=False) | trim }}
-        owner: root:root
-        path: /usr/local/share/ca-certificates/root_ca.crt
-- target:
-    group: bootstrap.cluster.x-k8s.io
-    version: v1beta1
-    kind: KubeadmConfigTemplate
-    name: .*
-  patch: |-
+      - op: add
+        path: /spec/kubeadmConfigSpec/files/-
+        value:
+          content: |
+            network: {config: disabled}
+          owner: root:root
+          path: /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
+      - op: add
+        path: /spec/kubeadmConfigSpec/files/-
+        value:
+          content: |
+            {{ _template.rootca | indent(width=12, first=False) | trim }}
+          owner: root:root
+          path: /usr/local/share/ca-certificates/root_ca.crt
+  - target:
+      group: bootstrap.cluster.x-k8s.io
+      version: v1beta1
+      kind: KubeadmConfigTemplate
+      name: .*
+    patch: |-
 {% for cmd in _template.runcmds %}
-    - op: add
-      path: /spec/template/spec/preKubeadmCommands/-
-      value: {{ cmd }}
+      - op: add
+        path: /spec/template/spec/preKubeadmCommands/-
+        value: {{ cmd }}
 {% endfor %}
-- target:
-    group: controlplane.cluster.x-k8s.io
-    version: v1beta1
-    kind: KubeadmControlPlane
-    name: .*
-  patch: |-
+  - target:
+      group: controlplane.cluster.x-k8s.io
+      version: v1beta1
+      kind: KubeadmControlPlane
+      name: .*
+    patch: |-
 {% for cmd in _template.runcmds %}
-    - op: add
-      path: /spec/kubeadmConfigSpec/preKubeadmCommands/-
-      value: {{ cmd }}
+      - op: add
+        path: /spec/kubeadmConfigSpec/preKubeadmCommands/-
+        value: {{ cmd }}
 {% endfor %}
 
-- target:
-    group: infrastructure.cluster.x-k8s.io
-    version: v1beta1
-    kind: VSphereMachineTemplate
-    name: \${CLUSTER_NAME}
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: ${CLUSTER_NAME}-master
-- target:
-    group: controlplane.cluster.x-k8s.io
-    version: v1beta1
-    kind: KubeadmControlPlane
-    name: \${CLUSTER_NAME}
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: ${CLUSTER_NAME}-master
-    - op: replace
-      path: /spec/machineTemplate/infrastructureRef/name
-      value: ${CLUSTER_NAME}-master
-- target:
-    group: cluster.x-k8s.io
-    version: v1beta1
-    kind: Cluster
-    name: \${CLUSTER_NAME}
-  patch: |-
-    - op: replace
-      path: /spec/controlPlaneRef/name
-      value: ${CLUSTER_NAME}-master
+  - target:
+      group: infrastructure.cluster.x-k8s.io
+      version: v1beta1
+      kind: VSphereMachineTemplate
+      name: \${CLUSTER_NAME}
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: ${CLUSTER_NAME}-master
+  - target:
+      group: controlplane.cluster.x-k8s.io
+      version: v1beta1
+      kind: KubeadmControlPlane
+      name: \${CLUSTER_NAME}
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: ${CLUSTER_NAME}-master
+      - op: replace
+        path: /spec/machineTemplate/infrastructureRef/name
+        value: ${CLUSTER_NAME}-master
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: Cluster
+      name: \${CLUSTER_NAME}
+    patch: |-
+      - op: replace
+        path: /spec/controlPlaneRef/name
+        value: ${CLUSTER_NAME}-master
 
-- target:
-    group: infrastructure.cluster.x-k8s.io
-    version: v1beta1
-    kind: VSphereMachineTemplate
-    name: \${CLUSTER_NAME}-worker
-  patch: |-
-    - op: replace
-      path: /spec/template/spec/numCPUs
-      value: {{ _template.nodesize.cpu }}
-    - op: replace
-      path: /spec/template/spec/memoryMiB
-      value: {{ _template.nodesize.memory }}
-- target:
-    group: cluster.x-k8s.io
-    version: v1beta1
-    kind: MachineDeployment
-    name: \${CLUSTER_NAME}-md-0
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: ${CLUSTER_NAME}-worker
-    - op: replace
-      path: /spec/template/spec/bootstrap/configRef/name
-      value: ${CLUSTER_NAME}-worker
-- target:
-    group: bootstrap.cluster.x-k8s.io
-    version: v1beta1
-    kind: KubeadmConfigTemplate
-    name: \${CLUSTER_NAME}-md-0
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: ${CLUSTER_NAME}-worker
+  - target:
+      group: infrastructure.cluster.x-k8s.io
+      version: v1beta1
+      kind: VSphereMachineTemplate
+      name: \${CLUSTER_NAME}-worker
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/numCPUs
+        value: {{ _template.nodesize.cpu }}
+      - op: replace
+        path: /spec/template/spec/memoryMiB
+        value: {{ _template.nodesize.memory }}
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: MachineDeployment
+      name: \${CLUSTER_NAME}-md-0
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: ${CLUSTER_NAME}-worker
+      - op: replace
+        path: /spec/template/spec/bootstrap/configRef/name
+        value: ${CLUSTER_NAME}-worker
+  - target:
+      group: bootstrap.cluster.x-k8s.io
+      version: v1beta1
+      kind: KubeadmConfigTemplate
+      name: \${CLUSTER_NAME}-md-0
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: ${CLUSTER_NAME}-worker

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
 
-patches:
-- patch: |-
+patchesStrategicMerge:
+  - |-
     apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
     kind: KubeadmConfigTemplate
     metadata:
@@ -31,7 +31,7 @@ patches:
           mounts:
           - - LABEL=blockstorage
             - /mnt/blockstorage
-- patch: |-
+  - |-
     apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
     kind: VSphereMachineTemplate
     metadata:
@@ -43,41 +43,42 @@ patches:
           additionalDisksGiB:
           - {{ _template.nodepool.additionaldisk }}
 
-- target:
-    group: bootstrap.cluster.x-k8s.io
-    version: v1beta1
-    kind: KubeadmConfigTemplate
-    name: {{ _template.cluster.name }}-worker
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: {{ _template.cluster.name }}-worker-storage
+patchesJson6902:
+  - target:
+      group: bootstrap.cluster.x-k8s.io
+      version: v1beta1
+      kind: KubeadmConfigTemplate
+      name: {{ _template.cluster.name }}-worker
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: {{ _template.cluster.name }}-worker-storage
 
-- target:
-    group: cluster.x-k8s.io
-    version: v1beta1
-    kind: MachineDeployment
-    name: {{ _template.cluster.name }}-worker
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: {{ _template.cluster.name }}-worker-storage
-    - op: replace
-      path: /spec/template/spec/bootstrap/configRef/name
-      value: {{ _template.cluster.name }}-worker-storage
-    - op: replace
-      path: /spec/template/spec/infrastructureRef/name
-      value: {{ _template.cluster.name }}-worker-storage
-    - op: replace
-      path: /spec/replicas
-      value: {{ _template.nodepool.size }}
+  - target:
+      group: cluster.x-k8s.io
+      version: v1beta1
+      kind: MachineDeployment
+      name: {{ _template.cluster.name }}-worker
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: {{ _template.cluster.name }}-worker-storage
+      - op: replace
+        path: /spec/template/spec/bootstrap/configRef/name
+        value: {{ _template.cluster.name }}-worker-storage
+      - op: replace
+        path: /spec/template/spec/infrastructureRef/name
+        value: {{ _template.cluster.name }}-worker-storage
+      - op: replace
+        path: /spec/replicas
+        value: {{ _template.nodepool.size }}
 
-- target:
-    group: infrastructure.cluster.x-k8s.io
-    version: v1beta1
-    kind: VSphereMachineTemplate
-    name: {{ _template.cluster.name }}-worker
-  patch: |-
-    - op: replace
-      path: /metadata/name
-      value: {{ _template.cluster.name }}-worker-storage
+  - target:
+      group: infrastructure.cluster.x-k8s.io
+      version: v1beta1
+      kind: VSphereMachineTemplate
+      name: {{ _template.cluster.name }}-worker
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: {{ _template.cluster.name }}-worker-storage

ansible/vars/metacluster.yml

@@ -119,9 +119,9 @@ components:
     workload:
       version:
         calico: v3.25.0
-        k8s: v1.25.10
+        k8s: v1.25.9
       node_template:
-        url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.25.10.ova
+        url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.25.9.ova
 
   # dex:
   #   helm:

packer/build.pkr.hcl

@@ -45,7 +45,7 @@ build {
       " -ManifestFileName '/scratch/bld_${var.vm_name}_${source.name}.mf'",
       "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
       " '/scratch/bld_${var.vm_name}_${source.name}.ovf' \\",
-      " /output/airgapped-k8s-${var.k8s_version}.${source.name}.ova"
+      " /output/airgapped-k8s-${var.next_release_version}+${var.k8s_version}-${source.name}.ova"
     ]
   }
 }

packer/variables.pkr.hcl

@@ -35,3 +35,4 @@ variable "docker_password" {
 }
 
 variable "k8s_version" {}
+variable "next_release_version" {}