diff --git a/charts/hub/odf/Chart.yaml b/charts/hub/odf/Chart.yaml deleted file mode 100644 index f27b6155..00000000 --- a/charts/hub/odf/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -description: A Helm chart to configure CephObjectStore -keywords: -- patterns -name: odf -version: 0.0.1 diff --git a/charts/hub/odf/templates/label-storage-nodes-job.yaml b/charts/hub/odf/templates/label-storage-nodes-job.yaml deleted file mode 100644 index d0350dcf..00000000 --- a/charts/hub/odf/templates/label-storage-nodes-job.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - annotations: - argocd.argoproj.io/sync-wave: "3" - name: label-storage-nodes-bundle -spec: - template: - spec: - containers: - - image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest - command: - - /bin/bash - - -c - - | - #!/usr/bin/env bash - set -e - if ! oc get nodes -l cluster.ocs.openshift.io/openshift-storage= ; then - echo "Worker nodes already labeled for storage" - exit 0 - else - # Wait for central to be ready - attempt_counter=0 - max_attempts=20 - echo "Labeling all worker nodes for storage" - oc label node -l node-role.kubernetes.io/worker= cluster.ocs.openshift.io/openshift-storage= - echo "Worker nodes labeled for storage" - fi - imagePullPolicy: Always - name: label-storage-nodes-bundle - dnsPolicy: ClusterFirst - restartPolicy: Never - serviceAccount: label-storage-nodes - serviceAccountName: label-storage-nodes - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/charts/hub/odf/templates/policy-odf-status.yaml b/charts/hub/odf/templates/policy-odf-status.yaml deleted file mode 100644 index fec1e3d8..00000000 --- a/charts/hub/odf/templates/policy-odf-status.yaml +++ /dev/null @@ -1,58 +0,0 @@ -apiVersion: policy.open-cluster-management.io/v1 -kind: Policy -metadata: - annotations: - policy.open-cluster-management.io/categories: SI System and Information Integrity - policy.open-cluster-management.io/controls: SI-7 Software Firmware and Information - Integrity - policy.open-cluster-management.io/standards: NIST SP 800-53 - argocd.argoproj.io/compare-options: IgnoreExtraneous - labels: - open-cluster-management.io/policy-set: openshift-plus - name: policy-odf-status - namespace: policies -spec: - disabled: false - policy-templates: - - objectDefinition: - apiVersion: policy.open-cluster-management.io/v1 - kind: ConfigurationPolicy - metadata: - name: policy-odf-status - spec: - object-templates: - - complianceType: musthave - objectDefinition: - apiVersion: apps/v1 - kind: Deployment - metadata: - name: noobaa-operator - namespace: openshift-storage - status: - conditions: - - status: "True" - type: Available - - complianceType: musthave - objectDefinition: - apiVersion: apps/v1 - kind: Deployment - metadata: - name: ocs-operator - namespace: openshift-storage - status: - conditions: - - status: "True" - type: Available - - complianceType: musthave - objectDefinition: - apiVersion: apps/v1 - kind: Deployment - metadata: - name: odf-operator-controller-manager - namespace: openshift-storage - status: - conditions: - - status: "True" - type: Available - remediationAction: inform - severity: medium \ No newline at end of file diff --git a/charts/hub/odf/templates/rbac/label-storage-bundle-role.yaml b/charts/hub/odf/templates/rbac/label-storage-bundle-role.yaml deleted file mode 100644 index 12de32ab..00000000 --- a/charts/hub/odf/templates/rbac/label-storage-bundle-role.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - annotations: - argocd.argoproj.io/sync-wave: "1" - name: label-storage-nodes -rules: - - apiGroups: - - "" - resources: - - nodes - verbs: - - get - - list - - patch - - update diff --git a/charts/hub/odf/templates/rbac/label-storage-bundle-rolebinding.yaml b/charts/hub/odf/templates/rbac/label-storage-bundle-rolebinding.yaml deleted file mode 100644 index 578b1815..00000000 --- a/charts/hub/odf/templates/rbac/label-storage-bundle-rolebinding.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: label-storage-nodes -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: label-storage-nodes -subjects: - - kind: ServiceAccount - name: label-storage-nodes - namespace: {{ .Values.ocs.namespace }} - diff --git a/charts/hub/odf/templates/rbac/label-storage-bundle-sa.yaml b/charts/hub/odf/templates/rbac/label-storage-bundle-sa.yaml deleted file mode 100644 index 9c769ac3..00000000 --- a/charts/hub/odf/templates/rbac/label-storage-bundle-sa.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: label-storage-nodes - namespace: {{ .Values.ocs.namespace }} - annotations: - argocd.argoproj.io/sync-wave: "1" diff --git a/charts/hub/odf/templates/rbac/quay-noobaa-deploy-rolebinding.yaml b/charts/hub/odf/templates/rbac/quay-noobaa-deploy-rolebinding.yaml deleted file mode 100644 index 5d4f756f..00000000 --- a/charts/hub/odf/templates/rbac/quay-noobaa-deploy-rolebinding.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: quay-noobaa-deploy-role - annotations: - argocd.argoproj.io/sync-wave: "2" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: quay-admin-role -subjects: - - kind: ServiceAccount - name: quay-admin-sa - namespace: {{ .Values.ocs.namespace }} \ No newline at end of file diff --git a/charts/hub/odf/templates/storagecluster.yaml b/charts/hub/odf/templates/storagecluster.yaml deleted file mode 100644 index 144aeac7..00000000 --- a/charts/hub/odf/templates/storagecluster.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: ocs.openshift.io/v1 -kind: StorageCluster -metadata: - annotations: - uninstall.ocs.openshift.io/cleanup-policy: delete - uninstall.ocs.openshift.io/mode: graceful - finalizers: - - storagecluster.ocs.openshift.io - name: ocs-storagecluster - namespace: {{ .Values.ocs.namespace }} -spec: - arbiter: {} - encryption: - kms: {} - externalStorage: {} - managedResources: - cephBlockPools: {} - cephCluster: {} - cephConfig: {} - cephDashboard: {} - cephFilesystems: {} - cephObjectStoreUsers: {} - cephObjectStores: {} - mirroring: {} - multiCloudGateway: - dbStorageClassName: {{ .Values.cloudProvider.storageClass }} - reconcileStrategy: standalone diff --git a/charts/hub/odf/values.yaml b/charts/hub/odf/values.yaml deleted file mode 100644 index b489cea1..00000000 --- a/charts/hub/odf/values.yaml +++ /dev/null @@ -1,56 +0,0 @@ -cloudProvider: - storageClass: default-rwo - -ocs: - namespace: openshift-storage - mon: - requests: - cpu: 1 - memory: 2Gi - mds: - requests: - cpu: 3 - memory: 8Gi - mgr: - requests: - cpu: 1 - memory: 3Gi - noobaacore: - requests: - cpu: 1 - memory: 4Gi - noobaadb: - requests: - cpu: 1 - memory: 4Gi - osd: - requests: - cpu: 2 - memory: 5Gi - pvc: - storage: 2Ti - storageClass: - name: ocs-storagecluster-ceph-rgw - region: us-west-1 #overwritten - objectStoreName: ocs-storagecluster-cephobjectstore - -toolbox: - name: ocsinit - enableCephTools: true - -global: - hub: - region: us-west-1 - -clusterGroup: - storageClass: gp2 - -#Define the odf storageSystem parameters -storageSystem: - deploy: false - name: ocs-storagecluster-storagesystem - namespace: openshift-storage - spec: - kind: storagecluster.ocs.openshift.io/v1 - name: ocs-storagecluster - namespace: "" diff --git a/values-all-in-one.yaml b/values-all-in-one.yaml index af899905..164f607e 100644 --- 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 index 45cd5c81..5ce6f0be 100644 --- 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