djpbessems/Packer.Images
djpbessems/Packer.Images
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing key to dict #2
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Danny Bessems 2022-11-08 20:11:31 +01:00
parent fe8700f300
commit 1f4bbca7ec
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/firstboot/files/ansible_payload/roles/metacluster/tasks/cleanup.yml
View File

@ -4,6 +4,7 @@
path: /opt/metacluster/container-images/*.tar path: /opt/metacluster/container-images/*.tar
format: gz format: gz
remove: yes remove: yes
ignore_errors: yes
- name: Cleanup tempfile - name: Cleanup tempfile
ansible.builtin.file: ansible.builtin.file:

1
ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/tasks/clusterapi.yml
View File

@ -23,6 +23,7 @@
network: "{{ vcenter_info.network }}" network: "{{ vcenter_info.network }}"
resourcepool: "{{ vcenter_info.resourcepool }}" resourcepool: "{{ vcenter_info.resourcepool }}"
cluster: cluster:
nodetemplate: "{{ downstream.node_template.image.name }}"
publickey: "{{ vapp['guestinfo.rootsshkey'] }}" publickey: "{{ vapp['guestinfo.rootsshkey'] }}"
version: "{{ components.clusterapi.workload.version.k8s }}" version: "{{ components.clusterapi.workload.version.k8s }}"
vip: "{{ vapp['workloadcluster.vip'] }}" vip: "{{ vapp['workloadcluster.vip'] }}"

6
ansible/roles/firstboot/files/ansible_payload/roles/workloadcluster/templates/clusterctl.j2
View File

@ -28,11 +28,11 @@ VSPHERE_STORAGE_POLICY: ""
VSPHERE_NETWORK: "{{ _template.hv.network }}" VSPHERE_NETWORK: "{{ _template.hv.network }}"
VSPHERE_RESOURCE_POOL: "{{ _template.hv.resourcepool }}" VSPHERE_RESOURCE_POOL: "{{ _template.hv.resourcepool }}"
VSPHERE_FOLDER: "" VSPHERE_FOLDER: ""
VSPHERE_TEMPLATE: "{{ _template.hv.nodetemplate }}"
VSPHERE_TEMPLATE: "{{ _template.cluster.nodetemplate }}"
VSPHERE_SSH_AUTHORIZED_KEY: "{{ _template.cluster.publickey }}"
KUBERNETES_VERSION: "{{ _template.cluster.version }}" KUBERNETES_VERSION: "{{ _template.cluster.version }}"
CONTROL_PLANE_ENDPOINT_IP: "{{ _template.cluster.vip }}" CONTROL_PLANE_ENDPOINT_IP: "{{ _template.cluster.vip }}"
VIP_NETWORK_INTERFACE: "ens192" VIP_NETWORK_INTERFACE: "ens192"
EXP_CLUSTER_RESOURCE_SET: "true" EXP_CLUSTER_RESOURCE_SET: "true"
VSPHERE_SSH_AUTHORIZED_KEY: "{{ _template.cluster.publickey }}"

9
ansible/roles/metacluster/tasks/staging.yml
View File

@ -12,10 +12,7 @@
version: "{{ platform.gitops.repository.revision }}" version: "{{ platform.gitops.repository.revision }}"
dest: /opt/metacluster/git-repositories/gitops dest: /opt/metacluster/git-repositories/gitops
- name: Download node-template images - name: Download node-template image
ansible.builtin.uri: ansible.builtin.uri:
url: "{{ item.url }}" url: "{{ downstream.node_template.image.url }}"
dest: /opt/workloadcluster/node-templates/{{ downstream.node_templates.prefix }}{{ item.name }} dest: /opt/workloadcluster/node-templates/{{ downstream.node_template.image.name }}
loop: "{{ downstream.node_templates.images }}"
loop_control:
label: "{{ downstream.node_templates.prefix }}{{ item.name }}"

9
ansible/vars/workloadcluster.yml
View File

@ -1,8 +1,7 @@
downstream: downstream:
node_templates: node_template:
prefix: ClusterAPITemplate_ image:
images:
# Refer to `https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/v1.3.5/README.md#kubernetes-versions-with-published-ovas` for a list of supported node templates # Refer to `https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/blob/v1.3.5/README.md#kubernetes-versions-with-published-ovas` for a list of supported node templates
- url: https://storage.googleapis.com/capv-images/release/v1.23.5/ubuntu-2004-kube-v1.23.5.ova url: https://storage.googleapis.com/capv-images/release/v1.23.5/ubuntu-2004-kube-v1.23.5.ova
name: ubuntu-2004-kube-v1.23.5.ova name: ubuntu-2004-kube-v1.23.5.ova