Add missing vApp property;Fix preflight check;Add missing folder;Revert Longhorn&K3s version
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Danny Bessems 2023-01-04 15:36:20 +01:00
parent d343b84b30
commit 9e63e243b8
5 changed files with 27 additions and 10 deletions

View File

@ -3,6 +3,7 @@
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
loop: loop:
- /etc/rancher/k3s
- /opt/metacluster/cluster-api/bootstrap-kubeadm/{{ components.clusterapi.management.version.base }} - /opt/metacluster/cluster-api/bootstrap-kubeadm/{{ components.clusterapi.management.version.base }}
- /opt/metacluster/cluster-api/cert-manager/{{ components.clusterapi.management.version.cert_manager }} - /opt/metacluster/cluster-api/cert-manager/{{ components.clusterapi.management.version.cert_manager }}
- /opt/metacluster/cluster-api/cluster-api/{{ components.clusterapi.management.version.base }} - /opt/metacluster/cluster-api/cluster-api/{{ components.clusterapi.management.version.base }}

View File

@ -1,7 +1,13 @@
- name: Check for vCenter connectivity - block:
- name: Check for vCenter connectivity
community.vmware.vmware_vcenter_settings_info: community.vmware.vmware_vcenter_settings_info:
hostname: "{{ vapp['hv.fqdn'] }}"
username: "{{ vapp['hv.username'] }}"
password: "{{ vapp['hv.password'] }}"
schema: vsphere schema: vsphere
register: vcenter_info register: vcenter_info
module_defaults:
group/vmware:
hostname: "{{ vapp['hv.fqdn'] }}"
validate_certs: no
username: "{{ vapp['hv.username'] }}"
password: "{{ vapp['hv.password'] }}"

View File

@ -83,7 +83,7 @@
ansible.builtin.shell: ansible.builtin.shell:
cmd: >- cmd: >-
clusterctl generate cluster \ clusterctl generate cluster \
vapp['workloadcluster.name'] \ {{ vapp['workloadcluster.name'] | lower }} \
--control-plane-machine-count {{ clustersize.controlplane }} \ --control-plane-machine-count {{ clustersize.controlplane }} \
--worker-machine-count {{ clustersize.workers }} \ --worker-machine-count {{ clustersize.workers }} \
--from ./custom-cluster-template.yaml \ --from ./custom-cluster-template.yaml \

View File

@ -1,7 +1,9 @@
platform: platform:
k3s: k3s:
version: v1.26.0+k3s1 # version: v1.26.0+k3s1
# max supported version by Longhorn is <v1.25.0
version: v1.24.9+k3s1
gitops: gitops:
repository: repository:
@ -149,7 +151,7 @@ components:
longhorn: longhorn:
helm: helm:
version: 1.4.0 version: 1.3.2
chart: longhorn/longhorn chart: longhorn/longhorn
parse_logic: cat values.yaml | yq eval '.. | select(has("repository")) | .repository + ":" + .tag' parse_logic: cat values.yaml | yq eval '.. | select(has("repository")) | .repository + ":" + .tag'
chart_values: !unsafe | chart_values: !unsafe |

View File

@ -98,6 +98,14 @@ PropertyCategories:
- Name: 2) Workload-cluster - Name: 2) Workload-cluster
ProductProperties: ProductProperties:
- Key: workloadcluster.name
Type: string(1..15)
Label: Workload-cluster name*
Description: ''
DefaultValue: 'WORKLOAD-{{ hostname.suffix }}'
Configurations: '*'
UserConfigurable: true
- Key: workloadcluster.vip - Key: workloadcluster.vip
Type: ip Type: ip
Label: Workload-cluster virtual IP* Label: Workload-cluster virtual IP*