From 83ce1be8bf6bceb98e94e5304a506e1e75158997 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Mon, 28 Nov 2022 16:22:15 +0100 Subject: [PATCH] Fix var reference;Upgrade all included components --- .../workloadcluster/tasks/nodetemplates.yml | 4 +- ansible/vars/metacluster.yml | 40 ++++++++++--------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml index 3b1129f..c948a0a 100644 --- a/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml +++ b/ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/nodetemplates.yml @@ -39,7 +39,7 @@ - name: Add vApp properties on deployed VM's community.vmware.vmware_guest: - name: "{{ (item | basename | split('.'))[:-1] | join('.') }}" + name: "{{ item.instance.hw_name }}" vapp_properties: - id: guestinfo.dns.servers value: ${dns:{{ vcenter_info.network }}} @@ -59,7 +59,7 @@ - name: Create snapshot on deployed VM's community.vmware.vmware_guest_snapshot: - folder: "{{ vcenter_info.folder }}" + # folder: "{{ vcenter_info.folder }}" name: "{{ item.instance.hw_name }}" state: present snapshot_name: "{{ ansible_date_time.iso8601_basic_short }}-base" diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index a10e532..23a7a78 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -1,7 +1,7 @@ platform: k3s: - version: v1.24.1+k3s1 + version: v1.25.4+k3s1 gitops: repository: @@ -53,7 +53,8 @@ components: argo-cd: helm: - version: 4.9.7 # (= ArgoCD v2.4.2) + # version: 4.9.7 # (= ArgoCD v2.4.2) + version: 5.14.1 # (= ArgoCD v2.5.2) chart: argo/argo-cd parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' chart_values: !unsafe | @@ -95,7 +96,8 @@ components: gitea: helm: - version: v6.0.0 # (= Gitea v1.17.1) + # version: v6.0.0 # (= Gitea v1.17.1) + version: v6.0.3 # (= Gitea v1.17.3) chart: gitea-charts/gitea parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | sed '/:/!s/$/:latest/' chart_values: !unsafe | @@ -126,7 +128,8 @@ components: harbor: helm: - version: 1.9.1 # (= Harbor v2.5.1) + # version: 1.9.1 # (= Harbor v2.5.1) + version: 1.10.2 # (= Harbor v2.6.2) chart: harbor/harbor parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' chart_values: !unsafe | @@ -145,7 +148,7 @@ components: longhorn: helm: - version: 1.3.0 + version: 1.3.2 chart: longhorn/longhorn parse_logic: cat values.yaml | yq eval '.. | select(has("repository")) | .repository + ":" + .tag' chart_values: !unsafe | @@ -160,7 +163,8 @@ components: sealed-secrets: helm: - version: 2.4.0 # (= SealedSecrets v0.18.1) + # version: 2.4.0 # (= SealedSecrets v0.18.1) + version: 2.7.1 # (= SealedSecrets v0.19.2) chart: sealed-secrets/sealed-secrets parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' @@ -205,16 +209,14 @@ dependencies: - vmware/powerclicore:12.7 # The following list is generated by running the following commands: # $ clusterctl init -i vsphere: [...] - # $ clusterctl generate cluster [...] | yq eval '.data.data' | yq --no-doc eval '.. | .image? | select(.)' - - quay.io/k8scsi/csi-node-driver-registrar:v2.0.1 - - gcr.io/cloud-provider-vsphere/csi/release/driver:v2.1.0 - - quay.io/k8scsi/livenessprobe:v2.1.0 - - quay.io/k8scsi/csi-attacher:v3.0.0 - - gcr.io/cloud-provider-vsphere/csi/release/driver:v2.1.0 - - quay.io/k8scsi/livenessprobe:v2.1.0 - - gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.1.0 - - quay.io/k8scsi/csi-provisioner:v2.0.0 + # $ clusterctl generate cluster [...] | yq eval '.data.data' | yq --no-doc eval '.. | .image? | select(.)' | sort -u - gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.18.1 + - gcr.io/cloud-provider-vsphere/csi/release/driver:v2.1.0 + - gcr.io/cloud-provider-vsphere/csi/release/syncer:v2.1.0 + - quay.io/k8scsi/csi-attacher:v3.0.0 + - quay.io/k8scsi/csi-node-driver-registrar:v2.0.1 + - quay.io/k8scsi/csi-provisioner:v2.0.0 + - quay.io/k8scsi/livenessprobe:v2.1.0 static_binaries: - filename: clusterctl @@ -223,20 +225,20 @@ dependencies: url: https://github.com/vmware/govmomi/releases/download/v0.29.0/govc_Linux_x86_64.tar.gz archive: compressed - filename: helm - url: https://get.helm.sh/helm-v3.9.0-linux-amd64.tar.gz + url: https://get.helm.sh/helm-v3.10.2-linux-amd64.tar.gz archive: compressed extra_opts: --strip-components=1 - filename: kubeseal - url: https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.18.2/kubeseal-0.18.2-linux-amd64.tar.gz + url: https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.19.2/kubeseal-0.19.2-linux-amd64.tar.gz archive: compressed - filename: skopeo url: https://code.spamasaurus.com/api/packages/djpbessems/generic/skopeo/v1.11.0-dev/skopeo - filename: step - url: https://dl.step.sm/gh-release/cli/gh-release-header/v0.22.0/step_linux_0.22.0_amd64.tar.gz + url: https://dl.step.sm/gh-release/cli/gh-release-header/v0.23.0/step_linux_0.23.0_amd64.tar.gz archive: compressed extra_opts: --strip-components=2 - filename: yq - url: http://github.com/mikefarah/yq/releases/download/v4.25.3/yq_linux_amd64 + url: http://github.com/mikefarah/yq/releases/download/v4.30.5/yq_linux_amd64 packages: apt: