diff --git a/ansible/vars/metacluster.yml b/ansible/vars/metacluster.yml index c09e47d..c33731d 100644 --- a/ansible/vars/metacluster.yml +++ b/ansible/vars/metacluster.yml @@ -58,7 +58,7 @@ components: argo-cd: helm: - version: 5.21.1 # (= ArgoCD v2.6.2) + version: 5.23.3 # (= ArgoCD v2.6.3) chart: argo/argo-cd parse_logic: helm template . | yq --no-doc eval '.. | .image? | select(.)' | sort -u | awk '!/ /' chart_values: !unsafe | diff --git a/scripts/Update-OvfConfiguration.bootstrap.yml b/scripts/Update-OvfConfiguration.bootstrap.yml index 2dd9882..34e6bb0 100644 --- a/scripts/Update-OvfConfiguration.bootstrap.yml +++ b/scripts/Update-OvfConfiguration.bootstrap.yml @@ -6,7 +6,9 @@ DeploymentConfigurations: - Id: cp1w2 Label: 'Workload-cluster: 1 control-plane node/2 worker nodes' - Description: 1 control-plane node/2 worker nodes + Description: | + 1 control-plane node + 2 worker nodes DynamicDisks: @@ -93,10 +95,7 @@ PropertyCategories: - Key: guestinfo.dnsserver Type: ip Label: DNS server* - Description: | - Just trying - Multi-line - Description + Description: '' DefaultValue: '' Configurations: '*' UserConfigurable: true @@ -153,10 +152,13 @@ PropertyCategories: UserConfigurable: true - Key: workloadcluster.nodesize - Type: 'string["SMALL: 2 vCPU/4GB RAM", "MEDIUM: 4vCPU/8GB RAM"]' + Type: string["small", "medium"] Label: Workload-cluster node size* - Description: 'All worker-nodes for the workload-cluster will be provisioned with number of cpu-cores and memory as specified' - DefaultValue: '' + Description: | + All worker-nodes for the workload-cluster will be provisioned with number of cpu-cores and memory as specified: + - SMALL: 2 vCPU/6GB RAM + - MEDIUM: 4 vCPU/8GB RAM + DefaultValue: 'small' Configurations: '*' UserConfigurable: true