Merge pull request #129 from mbaldessari/odf-switch

WIP Switch to the external ODF chart
validatedpatterns · Dec 5, 2024 · 36fdf6b · 36fdf6b
2 parents 034fc84 + 3ffe376
commit 36fdf6b
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 235 deletions.
diff --git a/charts/hub/odf/Chart.yaml b/charts/hub/odf/Chart.yaml
diff --git a/charts/hub/odf/templates/label-storage-nodes-job.yaml b/charts/hub/odf/templates/label-storage-nodes-job.yaml
diff --git a/charts/hub/odf/templates/policy-odf-status.yaml b/charts/hub/odf/templates/policy-odf-status.yaml
diff --git a/charts/hub/odf/templates/rbac/label-storage-bundle-role.yaml b/charts/hub/odf/templates/rbac/label-storage-bundle-role.yaml
diff --git a/charts/hub/odf/templates/rbac/label-storage-bundle-rolebinding.yaml b/charts/hub/odf/templates/rbac/label-storage-bundle-rolebinding.yaml
diff --git a/charts/hub/odf/templates/rbac/label-storage-bundle-sa.yaml b/charts/hub/odf/templates/rbac/label-storage-bundle-sa.yaml
diff --git a/charts/hub/odf/templates/rbac/quay-noobaa-deploy-rolebinding.yaml b/charts/hub/odf/templates/rbac/quay-noobaa-deploy-rolebinding.yaml
diff --git a/charts/hub/odf/templates/storagecluster.yaml b/charts/hub/odf/templates/storagecluster.yaml
diff --git a/charts/hub/odf/values.yaml b/charts/hub/odf/values.yaml
diff --git a/values-all-in-one.yaml b/values-all-in-one.yaml
@@ -28,6 +28,11 @@ global:
   git:
     taskImage: image-registry.openshift-image-registry.svc:5000/openshift/tools
 
+storageSystem:
+  deploy: true
+  inventory:
+    useSpecificNodes: False
+
 clusterGroup:
   name: hub
   isHubCluster: true
@@ -129,7 +134,8 @@ clusterGroup:
       name: storage
       namespace: openshift-storage
       project: opp
-      path: charts/hub/odf
+      chart: openshift-data-foundations
+      chartVersion: 0.1.*
 
     quay-registry:
       name: quay-registry

diff --git a/values-hub.yaml b/values-hub.yaml
@@ -1,3 +1,8 @@
+storageSystem:
+  deploy: true
+  inventory:
+    useSpecificNodes: false
+
 clusterGroup:
   name: hub
   isHubCluster: true
@@ -81,8 +86,9 @@ clusterGroup:
     storage:
       name: storage
       namespace: openshift-storage
-      project: opp
-      path: charts/hub/odf
+      chart: openshift-data-foundations
+      project: hub
+      chartVersion: 0.1.*
 
     quay-registry:
       name: quay-registry