Remove unnecessary ironic templates

suse-edge · Oct 19, 2023 · 03a9c7d · 03a9c7d
1 parent 6fd2a44
commit 03a9c7d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 32 deletions.
diff --git a/assets/metal3/metal3-0.2.0.tgz b/assets/metal3/metal3-0.2.0.tgz
diff --git a/charts/metal3/0.2.0/charts/ironic/templates/configmap.yaml b/charts/metal3/0.2.0/charts/ironic/templates/configmap.yaml
@@ -73,8 +73,4 @@ data:
   IRONIC_KERNEL_PARAMS: console=ttyS0
   IPA_INSECURE: "1"
   {{- end }}
-  {{- if .Values.databaseHost }}
-  DATABASE_HOST: {{ .Values.databaseHost }}
-  {{- else }}
-  DATABASE_HOST: {{ .Values.global.databaseServiceName }}.{{ .Release.Namespace }}.svc.cluster.local
-  {{- end }}
+  DATABASE_HOST: {{ .Values.global.databaseServiceName }}.{{ .Release.Namespace }}.svc.cluster.local
diff --git a/charts/metal3/0.2.0/charts/ironic/templates/deployment.yaml b/charts/metal3/0.2.0/charts/ironic/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         envFrom:
         - configMapRef:
             name: ironic-bmo
-        {{- if and .Values.requireProvisioningIP (eq $.Values.global.provisioningIP "") }}
+        {{- if and (eq $.Values.global.provisioningInterface "") (eq $.Values.global.provisioningIP "") }}
         env:
         - name: PROVISIONING_IP
           valueFrom:
@@ -93,7 +93,7 @@ spec:
             secretKeyRef:
               key: password
               name: ironic-mariadb
-        {{- if and .Values.requireProvisioningIP (eq $.Values.global.provisioningIP "") }}
+        {{- if and (eq $.Values.global.provisioningInterface "") (eq $.Values.global.provisioningIP "") }}
         - name: PROVISIONING_IP
           valueFrom:
             fieldRef:
@@ -151,7 +151,7 @@ spec:
             secretKeyRef:
               key: password
               name: ironic-mariadb
-        {{- if and .Values.requireProvisioningIP (eq $.Values.global.provisioningIP "") }}
+        {{- if and (eq $.Values.global.provisioningInterface "") (eq $.Values.global.provisioningIP "") }}
         - name: PROVISIONING_IP
           valueFrom:
             fieldRef:

diff --git a/charts/metal3/0.2.0/charts/ironic/values.yaml b/charts/metal3/0.2.0/charts/ironic/values.yaml
@@ -87,13 +87,6 @@ podAnnotations: {}
 podSecurityContext: {}
   # fsGroup: 2000
 
-requireProvisioningIP: true
-
-# Host on which ironic can reach its database.
-# If left empty, host will be resolved to the FQDN
-# of the service with name provided under the 'global.databaseServiceName' property
-databaseHost: ""
-
 service:
   type: NodePort
   annotations: {}

diff --git a/index.yaml b/index.yaml
@@ -55,7 +55,7 @@ entries:
   metal3:
   - apiVersion: v2
     appVersion: 1.16.0
-    created: "2023-10-19T16:11:18.028367+03:00"
+    created: "2023-10-19T17:59:24.924432+03:00"
     dependencies:
     - alias: metal3-baremetal-operator
       name: baremetal-operator
@@ -75,7 +75,7 @@ entries:
       repository: file://./charts/media
       version: 0.2.0
     description: A Helm chart that installs all of the dependencies needed for Metal3
-    digest: 9ea7e4d277ba086d5cc399f651d654010e0dccdab113a1c210f4377327c4f878
+    digest: e41bd6f7ee7a3cbcde8534562f78e18600603dd62a50d746d08d47696c0a4dd2
     icon: https://github.com/cncf/artwork/raw/master/projects/metal3/icon/color/metal3-icon-color.svg
     name: metal3
     type: application

diff --git a/packages/ironic/charts/templates/configmap.yaml b/packages/ironic/charts/templates/configmap.yaml
@@ -73,8 +73,4 @@ data:
   IRONIC_KERNEL_PARAMS: console=ttyS0
   IPA_INSECURE: "1"
   {{- end }}
-  {{- if .Values.databaseHost }}
-  DATABASE_HOST: {{ .Values.databaseHost }}
-  {{- else }}
-  DATABASE_HOST: {{ .Values.global.databaseServiceName }}.{{ .Release.Namespace }}.svc.cluster.local
-  {{- end }}
+  DATABASE_HOST: {{ .Values.global.databaseServiceName }}.{{ .Release.Namespace }}.svc.cluster.local
diff --git a/packages/ironic/charts/templates/deployment.yaml b/packages/ironic/charts/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         envFrom:
         - configMapRef:
             name: ironic-bmo
-        {{- if and .Values.requireProvisioningIP (eq $.Values.global.provisioningIP "") }}
+        {{- if and (eq $.Values.global.provisioningInterface "") (eq $.Values.global.provisioningIP "") }}
         env:
         - name: PROVISIONING_IP
           valueFrom:
@@ -93,7 +93,7 @@ spec:
             secretKeyRef:
               key: password
               name: ironic-mariadb
-        {{- if and .Values.requireProvisioningIP (eq $.Values.global.provisioningIP "") }}
+        {{- if and (eq $.Values.global.provisioningInterface "") (eq $.Values.global.provisioningIP "") }}
         - name: PROVISIONING_IP
           valueFrom:
             fieldRef:
@@ -151,7 +151,7 @@ spec:
             secretKeyRef:
               key: password
               name: ironic-mariadb
-        {{- if and .Values.requireProvisioningIP (eq $.Values.global.provisioningIP "") }}
+        {{- if and (eq $.Values.global.provisioningInterface "") (eq $.Values.global.provisioningIP "") }}
         - name: PROVISIONING_IP
           valueFrom:
             fieldRef:

diff --git a/packages/ironic/charts/values.yaml b/packages/ironic/charts/values.yaml
@@ -87,13 +87,6 @@ podAnnotations: {}
 podSecurityContext: {}
   # fsGroup: 2000
 
-requireProvisioningIP: true
-
-# Host on which ironic can reach its database.
-# If left empty, host will be resolved to the FQDN
-# of the service with name provided under the 'global.databaseServiceName' property
-databaseHost: ""
-
 service:
   type: NodePort
   annotations: {}