From 2d99511360d80573e620312f7d957f5175af2842 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Thu, 24 Nov 2022 10:04:46 +0100 Subject: [PATCH] Upgrade cluster api and dependencies --- .../ansible_payload/roles/cleanup/tasks/service.yml | 2 ++ ansible/vars/metacluster.yml | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/service.yml b/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/service.yml index 20ad7a2..05c61ab 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/service.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/service.yml @@ -17,6 +17,8 @@ mode: o+x - src: systemdunit.j2 dest: /etc/systemd/system/{{ _template.service.name }}.service + loop_control: + label: "{{ item.src }}" - name: Enable tarball compression service ansible.builtin.systemd: diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index a11f1ae..3e8d8b9 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -70,7 +70,7 @@ components: cert-manager: helm: - version: 1.9.1 + version: 1.10.1 chart: jetstack/cert-manager parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' # chart_values: !unsafe | @@ -80,10 +80,10 @@ components: management: version: # Must match the version referenced at `dependencies.static_binaries[.filename==clusterctl].url` - base: v1.2.4 + base: v1.2.6 # Must match the version referenced at `components.cert-manager.helm.version` - cert_manager: v1.9.1 - infrastructure_vsphere: v1.3.5 + cert_manager: v1.10.1 + infrastructure_vsphere: v1.5.0 workload: version: k8s: v1.23.5 @@ -217,7 +217,7 @@ dependencies: static_binaries: - filename: clusterctl - url: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.4/clusterctl-linux-amd64 + url: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/clusterctl-linux-amd64 - filename: govc url: https://github.com/vmware/govmomi/releases/download/v0.29.0/govc_Linux_x86_64.tar.gz archive: compressed