1 Commits

Author SHA1 Message Date
2addda3f06 Upgrade node template OS version;Upgrade K8s minor version
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-19 12:19:06 +02:00
6 changed files with 23 additions and 64 deletions

View File

@ -10,11 +10,6 @@ volumes:
claim: claim:
name: flexvolsmb-drone-scratch name: flexvolsmb-drone-scratch
trigger:
event:
exclude:
- tag
steps: steps:
- name: Debugging information - name: Debugging information
image: bv11-cr01.bessems.eu/library/packer-extended image: bv11-cr01.bessems.eu/library/packer-extended
@ -37,44 +32,9 @@ steps:
packer/preseed/UbuntuServer22.04/user-data \ packer/preseed/UbuntuServer22.04/user-data \
scripts 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 - name: Install Ansible Galaxy collections
depends_on: depends_on:
- Semantic Release (Dry-run) - Linting
image: bv11-cr01.bessems.eu/library/packer-extended image: bv11-cr01.bessems.eu/library/packer-extended
pull: always pull: always
commands: commands:
@ -82,6 +42,9 @@ steps:
ansible-galaxy collection install \ ansible-galaxy collection install \
-r ansible/requirements.yml \ -r ansible/requirements.yml \
-p ./ansible/collections -p ./ansible/collections
volumes:
- name: scratch
path: /scratch
- name: Kubernetes Bootstrap Appliance - name: Kubernetes Bootstrap Appliance
depends_on: depends_on:
@ -94,7 +57,6 @@ steps:
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)
export NEXT_RELEASE_VERSION=$(cat .version)
- | - |
packer init -upgrade \ packer init -upgrade \
./packer ./packer
@ -109,7 +71,6 @@ steps:
-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 \
-var next_release_version=$NEXT_RELEASE_VERSION \
./packer ./packer
- | - |
packer build \ packer build \
@ -123,7 +84,6 @@ steps:
-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 \
-var next_release_version=$NEXT_RELEASE_VERSION \
./packer ./packer
environment: environment:
DOCKER_USERNAME: DOCKER_USERNAME:
@ -156,7 +116,6 @@ steps:
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)
export NEXT_RELEASE_VERSION=$(cat .version)
- | - |
packer init -upgrade \ packer init -upgrade \
./packer ./packer
@ -171,7 +130,6 @@ steps:
-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 \
-var next_release_version=$NEXT_RELEASE_VERSION \
./packer ./packer
- | - |
packer build \ packer build \
@ -185,7 +143,6 @@ steps:
-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 \
-var next_release_version=$NEXT_RELEASE_VERSION \
./packer ./packer
environment: environment:
DOCKER_USERNAME: DOCKER_USERNAME:

View File

@ -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"]
]
}

View File

@ -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
}

View File

@ -1,7 +1,7 @@
platform: platform:
k3s: k3s:
version: v1.25.9+k3s1 version: v1.26.4+k3s1
packaged_components: packaged_components:
- name: traefik - name: traefik
@ -115,13 +115,13 @@ components:
infrastructure_vsphere: v1.6.0 infrastructure_vsphere: v1.6.0
ipam_incluster: v0.1.0-alpha.2 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 # 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: workload:
version: version:
calico: v3.25.0 calico: v3.25.0
k8s: v1.25.9 k8s: v1.26.4
node_template: 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: # dex:
# helm: # helm:

View File

@ -45,7 +45,7 @@ build {
" -ManifestFileName '/scratch/bld_${var.vm_name}_${source.name}.mf'", " -ManifestFileName '/scratch/bld_${var.vm_name}_${source.name}.mf'",
"ovftool --acceptAllEulas --allowExtraConfig --overwrite \\", "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
" '/scratch/bld_${var.vm_name}_${source.name}.ovf' \\", " '/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"
] ]
} }
} }

View File

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