fix:Test semantic release dry-run

.drone.yml

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

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

@@ -1,14 +0,0 @@
-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/vars/metacluster.yml

@@ -1,7 +1,7 @@
 platform:
 
   k3s:
-    version: v1.26.3+k3s1
+    version: v1.25.9+k3s1
 
   packaged_components:
     - name: traefik
@@ -115,13 +115,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.26.0
+        cpi_vsphere: v1.25.2
     workload:
       version:
         calico: v3.25.0
-        k8s: v1.26.3
+        k8s: v1.25.9
       node_template:
-        url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2004-kube-v1.26.3.ova
+        url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.25.9.ova
 
   # dex:
   #   helm: