Align metal3 chart with 0.2.0 release

alknopfler · Nov 2, 2023 · eb03169 · eb03169
1 parent e74ce9d
commit eb03169
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 70 deletions.
diff --git a/roles/baremetal/files/get_component_versions.sh b/roles/baremetal/files/get_component_versions.sh
@@ -84,7 +84,7 @@ printf "|Component           |Version                                      |\n"
 printf ' %67s\n' | tr ' ' -
 HELMDIR=$HOME/charts
 for component in `ls $HELMDIR`; do
-	if [[ $component == "metal3-deploy" ]]; then
+	if [[ $component == "metal3" ]]; then
 		continue
         fi		
 

diff --git a/roles/baremetal/tasks/main.yml b/roles/baremetal/tasks/main.yml
@@ -24,9 +24,6 @@
     repo_url: "{{ baremetal_repo_url }}"
     repo_branch: "{{ baremetal_branch }}"
     repo_pull_request: "{{ baremetal_pull_request | default('') }}"
-
-- name: Organize charts repo
-  include_tasks: organize_charts_repo_core.yml
 
 - name: Checkout sylva-core repo
   include_tasks: checkout_repo.yml
@@ -66,7 +63,7 @@
   set_fact:
     node_ssh_public_key: "{{ ssh_key_gen_result.public_key }}"
 
-- name: Create metal3-deploy overrides yaml file
+- name: Create metal3 overrides yaml file
   template:
     src: "parent-chart-overrides.yaml.j2"
     dest: "~/parent-chart-overrides.yaml"
@@ -76,7 +73,7 @@
 - name: Deploy helm components using file based overrides
   shell: >-
     env HELM_EXPERIMENTAL_OCI=1 \
-    helm upgrade --install heavy-metal metal3-deploy \
+    helm upgrade --install heavy-metal metal3 \
       --create-namespace --namespace metal-cubed \
       --values ~/parent-chart-overrides.yaml \
       --atomic --timeout 30m

diff --git a/roles/baremetal/tasks/organize_charts_repo_core.yml b/roles/baremetal/tasks/organize_charts_repo_core.yml
diff --git a/roles/baremetal/tasks/organize_charts_repo_infra.yml b/roles/baremetal/tasks/organize_charts_repo_infra.yml
diff --git a/roles/baremetal/templates/parent-chart-overrides.yaml.j2 b/roles/baremetal/templates/parent-chart-overrides.yaml.j2
@@ -1,9 +1,6 @@
 global:
-  enable_metal3_media_server: false
   enable_dnsmasq: false
-  enable_ironic: true
   enable_pxe_boot: false
-  dnsDomain: {{ dns_domain }}
   dnsmasqDefaultRouter: {{ dhcp_router | default('192.168.75.254') }}
   dnsmasqDNSServer: {{ dns_server | default(metal3_network_infra_provisioning_ip) }}
   dhcpRange: {{ dhcp_range | default('192.168.75.10,192.168.75.99') }}

diff --git a/roles/baremetal/templates/values.yaml.j2 b/roles/baremetal/templates/values.yaml.j2
@@ -105,13 +105,13 @@ units:
     helmrelease_spec:
       chart:
         spec:
-          chart: charts/metal3-deploy/0.1.0
+          chart: charts/metal3/0.2.0
       timeout: 30m
       install:
         createNamespace: true
         timeout: 30m
       targetNamespace: metal3-system
-      values: # see https://github.com/rancher-sandbox/baremetal/blob/master/helm-charts/metal3-deploy/values.yaml
+      values: # see https://github.com/suse-edge/charts/tree/main/charts/metal3
         global:
           enable_metal3_media_server: false
           enable_dnsmasq: false