Compare commits
	
		
			1 Commits
		
	
	
		
			Test_SemRe
			...
			2addda3f06
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2addda3f06 | 
							
								
								
									
										51
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										51
									
								
								.drone.yml
									
									
									
									
									
								
							@@ -10,11 +10,6 @@ volumes:
 | 
			
		||||
  claim:
 | 
			
		||||
    name: flexvolsmb-drone-scratch
 | 
			
		||||
 | 
			
		||||
trigger:
 | 
			
		||||
  event:
 | 
			
		||||
    exclude:
 | 
			
		||||
    - tag
 | 
			
		||||
 | 
			
		||||
steps:
 | 
			
		||||
- name: Debugging information
 | 
			
		||||
  image: bv11-cr01.bessems.eu/library/packer-extended
 | 
			
		||||
@@ -37,44 +32,9 @@ steps:
 | 
			
		||||
      packer/preseed/UbuntuServer22.04/user-data \
 | 
			
		||||
      scripts
 | 
			
		||||
 | 
			
		||||
- 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)
 | 
			
		||||
  - Linting
 | 
			
		||||
  image: bv11-cr01.bessems.eu/library/packer-extended
 | 
			
		||||
  pull: always
 | 
			
		||||
  commands:
 | 
			
		||||
@@ -82,6 +42,9 @@ steps:
 | 
			
		||||
    ansible-galaxy collection install \
 | 
			
		||||
      -r ansible/requirements.yml \
 | 
			
		||||
      -p ./ansible/collections
 | 
			
		||||
  volumes:
 | 
			
		||||
  - name: scratch
 | 
			
		||||
    path: /scratch
 | 
			
		||||
 | 
			
		||||
- name: Kubernetes Bootstrap Appliance
 | 
			
		||||
  depends_on:
 | 
			
		||||
@@ -94,7 +57,6 @@ 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
 | 
			
		||||
@@ -109,7 +71,6 @@ 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 \
 | 
			
		||||
@@ -123,7 +84,6 @@ 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:
 | 
			
		||||
@@ -156,7 +116,6 @@ 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
 | 
			
		||||
@@ -171,7 +130,6 @@ 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 \
 | 
			
		||||
@@ -185,7 +143,6 @@ 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:
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +0,0 @@
 | 
			
		||||
{
 | 
			
		||||
    "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"]
 | 
			
		||||
    ]
 | 
			
		||||
}
 | 
			
		||||
@@ -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
 | 
			
		||||
            }
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
platform:
 | 
			
		||||
 | 
			
		||||
  k3s:
 | 
			
		||||
    version: v1.25.9+k3s1
 | 
			
		||||
    version: v1.26.4+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.25.2
 | 
			
		||||
        cpi_vsphere: v1.26.0
 | 
			
		||||
    workload:
 | 
			
		||||
      version:
 | 
			
		||||
        calico: v3.25.0
 | 
			
		||||
        k8s: v1.25.9
 | 
			
		||||
        k8s: v1.26.4
 | 
			
		||||
      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.26.4.ova
 | 
			
		||||
 | 
			
		||||
  # dex:
 | 
			
		||||
  #   helm:
 | 
			
		||||
 
 | 
			
		||||
@@ -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.next_release_version}+${var.k8s_version}-${source.name}.ova"
 | 
			
		||||
      " /output/airgapped-k8s-${var.k8s_version}.${source.name}.ova"
 | 
			
		||||
    ]
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -35,4 +35,3 @@ variable "docker_password" {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
variable "k8s_version" {}
 | 
			
		||||
variable "next_release_version" {}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user