17 Commits

Author SHA1 Message Date
cce39a5bb7 fix:Test semantic release dry-run
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is failing
2023-05-20 15:18:23 +02:00
823cc467fa Explicitly install semantic-release plugins #2
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-20 14:32:47 +02:00
9cb89bf055 Try different syntax
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 14:30:38 +02:00
358cbe39ea Fix quote
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 14:28:31 +02:00
0fee2df2a6 Explicitly install semantic-release plugins
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2023-05-20 13:44:54 +02:00
e4e58e4789 Disable npm plugin
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 13:31:48 +02:00
75158a8a5b Fix variable substitution
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 13:26:49 +02:00
c83d541a0d Remove redundant parameter
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 13:24:20 +02:00
a46610f828 Add git credentials
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 13:22:20 +02:00
fe5147bd2e Override branch during semantic-release dry-run
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 12:58:44 +02:00
6d168f0517 Add semantic-release prerequisites
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-20 12:48:40 +02:00
68445ee13f Testing semantic-release
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-20 12:44:32 +02:00
31b21c9b7a Upgrade node template OS version
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-19 12:19:42 +02:00
e03cd20d65 Replay upstream changes;Upgrade to latest minor K8s version
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-19 11:38:53 +02:00
1c19708855 Increase default retries;Add healthcheck
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-23 16:51:17 +01:00
942c13dde7 Improve console healthchecks
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-23 11:42:34 +01:00
439223c56e Build n-1 version
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-22 08:54:45 +01:00
10 changed files with 351 additions and 393 deletions

View File

@ -21,8 +21,8 @@ steps:
- yamllint --version
- name: Linting
# depends_on:
# - Debugging information
depends_on:
- Debugging information
image: bv11-cr01.bessems.eu/library/packer-extended
pull: always
commands:
@ -32,157 +32,189 @@ steps:
packer/preseed/UbuntuServer22.04/user-data \
scripts
- name: Install Ansible Galaxy collections
# depends_on:
# - Linting
image: bv11-cr01.bessems.eu/library/packer-extended
- name: Semantic Release (Dry-run)
depends_on:
- Linting
image: bv11-cr01.bessems.eu/proxy/library/node:20-slim
pull: always
commands:
- |
ansible-galaxy collection install \
-r ansible/requirements.yml \
-p ./ansible/collections
volumes:
- name: scratch
path: /scratch
apt-get update
- |
apt-get install -y --no-install-recommends \
git-core \
ca-certificates
- |
npm install \
semantic-release \
@semantic-release/commit-analyzer \
@semantic-release/release-notes-generator\
@semantic-release/exec
- |
export GIT_CREDENTIALS=$${GIT_USERNAME}:$${GIT_APIKEY}
- |
npx semantic-release \
--branches ${DRONE_BRANCH} \
--plugins @semantic-release/commit-analyzer,@semantic-release/release-notes-generator,@semantic-release/exec \
--dry-run
environment:
GIT_APIKEY:
from_secret: git_apikey
GIT_USERNAME: djpbessems
- name: Kubernetes Bootstrap Appliance
# Add random change for testing semantic release commit
# - 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
pull: always
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.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
# image: bv11-cr01.bessems.eu/library/packer-extended
# pull: always
# 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.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
# - 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
# 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: 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
# 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

View File

@ -16,16 +16,14 @@
{ 'components': (
metacluster_chartvalues |
combine({ 'clusterapi': components.clusterapi }) |
combine({ 'kubevip' : components.kubevip }) ),
'appliance': {
'version': (applianceversion)
}
combine({ 'kubevip' : components.kubevip }) )
} | 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 }}"

View File

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

View File

@ -1,27 +0,0 @@
- 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

View File

@ -1,6 +1,5 @@
- 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

View File

@ -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,6 +125,7 @@ patches:
- {{ _template.network.dnsserver }}
networkName: '${VSPHERE_NETWORK}'
patchesJson6902:
- target:
group: controlplane.cluster.x-k8s.io
version: v1beta1
@ -163,7 +164,7 @@ patches:
path: /spec/kubeadmConfigSpec/files/-
value:
content: |
{{ _template.rootca | indent(width=10, first=False) | trim }}
{{ _template.rootca | indent(width=12, first=False) | trim }}
owner: root:root
path: /usr/local/share/ca-certificates/root_ca.crt
- target:

View File

@ -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,6 +43,7 @@ patches:
additionalDisksGiB:
- {{ _template.nodepool.additionaldisk }}
patchesJson6902:
- target:
group: bootstrap.cluster.x-k8s.io
version: v1beta1

View File

@ -1,7 +1,7 @@
platform:
k3s:
version: v1.27.1+k3s1
version: v1.25.9+k3s1
packaged_components:
- name: traefik
@ -51,8 +51,6 @@ 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:
@ -117,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.1
cpi_vsphere: v1.25.2
workload:
version:
calico: v3.25.0
k8s: v1.27.1
k8s: v1.25.9
node_template:
url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.27.1.ova
url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.25.9.ova
# dex:
# helm:
@ -227,34 +225,6 @@ 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)

View File

@ -28,7 +28,6 @@ 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}",

View File

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