From 9cbb84a0f3ad9cc542d65017d94997eb34eac2f6 Mon Sep 17 00:00:00 2001 From: djpbessems Date: Wed, 12 Jun 2024 22:10:38 +1000 Subject: [PATCH] chore: Remove redundant node template injection task --- ansible/roles/assets/tasks/main.yml | 1 - ansible/roles/assets/tasks/nodetemplates.yml | 4 ---- ansible/vars/metacluster.yml | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 ansible/roles/assets/tasks/nodetemplates.yml diff --git a/ansible/roles/assets/tasks/main.yml b/ansible/roles/assets/tasks/main.yml index 5003dac..f607470 100644 --- a/ansible/roles/assets/tasks/main.yml +++ b/ansible/roles/assets/tasks/main.yml @@ -29,4 +29,3 @@ - import_tasks: manifests.yml - import_tasks: kubeadm.yml - import_tasks: containerimages.yml -- import_tasks: nodetemplates.yml diff --git a/ansible/roles/assets/tasks/nodetemplates.yml b/ansible/roles/assets/tasks/nodetemplates.yml deleted file mode 100644 index eb7b93c..0000000 --- a/ansible/roles/assets/tasks/nodetemplates.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: Download node-template image - ansible.builtin.uri: - url: "{{ components.clusterapi.workload.node_template.url }}" - dest: /opt/workloadcluster/node-templates/{{ components.clusterapi.workload.node_template.url | basename}} diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index c28960c..4c82133 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -122,8 +122,8 @@ components: calico: v3.27.3 k8s: v1.30.1 node_template: - # url: https://{{ repo_username }}:{{ repo_password }}@sn.itch.fyi/Repository/rel/ubuntu-2204-kube-v1.27.1.ova - url: https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/templates%2Fv1.30.0/ubuntu-2204-kube-v1.30.0.ova + # Not used anymore; should be uploaded to hypervisor manually! + # https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/download/templates%2Fv1.30.0/ dex: helm: