From 56cd8d4169cc61fc6b169611a30eb2678c937a71 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 23 Jan 2025 17:39:56 -0500 Subject: [PATCH] Remove rhoai-test cluster overlay This cluster has been decomissioned and has been replaced with cairo cluster. See: https://github.com/nerc-project/operations/issues/875 --- .../certificates/default-api-certificate.yaml | 14 --- .../default-ingress-certificate.yaml | 14 --- .../certificates/kustomization.yaml | 5 - .../externalsecrets/github-group-sync.yaml | 20 ---- .../externalsecrets/kustomization.yaml | 4 - .../rook-ceph-external-cluster-details.yaml | 16 ---- .../rhoai-test/feature/odf/kustomization.yaml | 14 --- .../redhatcop.redhat.io/odf-node-patcher.yaml | 21 ----- ...xternal-storagecluster-ceph-rbd_patch.yaml | 17 ---- .../datasciencecluster.yaml | 30 ------ .../datascienceclusters/kustomization.yaml | 5 - .../feature/rhoai/kustomization.yaml | 13 --- .../odhdashboardconfigs/kustomization.yaml | 4 - .../odh-dashboard-config.yaml | 94 ------------------- .../subscriptions/subscription-patch.yaml | 7 -- .../rhoai-test/issuers/kustomization.yaml | 5 - .../openshift-config/kustomization.yaml | 5 - .../openshift-ingress/kustomization.yaml | 5 - .../overlays/rhoai-test/kustomization.yaml | 80 ---------------- .../group-sync-operator/kustomization.yaml | 5 - .../secretstores/kustomization.yaml | 7 -- .../openshift-config/kustomization.yaml | 5 - .../openshift-ingress/kustomization.yaml | 5 - .../openshift-logging/kustomization.yaml | 5 - 24 files changed, 400 deletions(-) delete mode 100644 cluster-scope/overlays/rhoai-test/certificates/default-api-certificate.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/certificates/default-ingress-certificate.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/certificates/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/externalsecrets/github-group-sync.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/externalsecrets/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/odf/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/datasciencecluster.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/rhoai/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/odh-dashboard-config.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/feature/rhoai/subscriptions/subscription-patch.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/issuers/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/issuers/openshift-config/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/issuers/openshift-ingress/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/secretstores/group-sync-operator/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/secretstores/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/secretstores/openshift-config/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/secretstores/openshift-ingress/kustomization.yaml delete mode 100644 cluster-scope/overlays/rhoai-test/secretstores/openshift-logging/kustomization.yaml diff --git a/cluster-scope/overlays/rhoai-test/certificates/default-api-certificate.yaml b/cluster-scope/overlays/rhoai-test/certificates/default-api-certificate.yaml deleted file mode 100644 index 11681eee..00000000 --- a/cluster-scope/overlays/rhoai-test/certificates/default-api-certificate.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: default-api-certificate - namespace: openshift-config -spec: - issuerRef: - name: letsencrypt-production-dns01 - kind: Issuer - secretName: default-api-certificate - duration: 2160h0m0s - renewBefore: 360h0m0s - dnsNames: - - "api.rhoai-test.nerc.mghpcc.org" diff --git a/cluster-scope/overlays/rhoai-test/certificates/default-ingress-certificate.yaml b/cluster-scope/overlays/rhoai-test/certificates/default-ingress-certificate.yaml deleted file mode 100644 index 2bf10f2f..00000000 --- a/cluster-scope/overlays/rhoai-test/certificates/default-ingress-certificate.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: default-ingress-certificate - namespace: openshift-ingress -spec: - issuerRef: - name: letsencrypt-production-dns01 - kind: Issuer - secretName: default-ingress-certificate - duration: 2160h0m0s - renewBefore: 360h0m0s - dnsNames: - - "*.apps.rhoai-test.nerc.mghpcc.org" diff --git a/cluster-scope/overlays/rhoai-test/certificates/kustomization.yaml b/cluster-scope/overlays/rhoai-test/certificates/kustomization.yaml deleted file mode 100644 index c34b4959..00000000 --- a/cluster-scope/overlays/rhoai-test/certificates/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- default-api-certificate.yaml -- default-ingress-certificate.yaml diff --git a/cluster-scope/overlays/rhoai-test/externalsecrets/github-group-sync.yaml b/cluster-scope/overlays/rhoai-test/externalsecrets/github-group-sync.yaml deleted file mode 100644 index 2f6e9a89..00000000 --- a/cluster-scope/overlays/rhoai-test/externalsecrets/github-group-sync.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: github-group-sync - namespace: group-sync-operator -spec: - secretStoreRef: - name: nerc-secret-store - kind: SecretStore - target: - name: github-group-sync - data: - - secretKey: appId - remoteRef: - key: nerc/rhoai-test/group-sync-operator/github-group-sync-token - property: appId - - secretKey: privateKey - remoteRef: - key: nerc/rhoai-test/group-sync-operator/github-group-sync-token - property: privateKey diff --git a/cluster-scope/overlays/rhoai-test/externalsecrets/kustomization.yaml b/cluster-scope/overlays/rhoai-test/externalsecrets/kustomization.yaml deleted file mode 100644 index 40b9db5c..00000000 --- a/cluster-scope/overlays/rhoai-test/externalsecrets/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- github-group-sync.yaml diff --git a/cluster-scope/overlays/rhoai-test/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml b/cluster-scope/overlays/rhoai-test/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml deleted file mode 100644 index 3eecf4b8..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/odf/externalsecrets/rook-ceph-external-cluster-details.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: rook-ceph-external-cluster-details - namespace: openshift-storage -spec: - secretStoreRef: - name: nerc-secret-store - kind: SecretStore - target: - name: rook-ceph-external-cluster-details - data: - - secretKey: external_cluster_details - remoteRef: - key: nerc/rhoai-test/openshift-storage/rook-ceph-external-cluster-details - property: external_cluster_details diff --git a/cluster-scope/overlays/rhoai-test/feature/odf/kustomization.yaml b/cluster-scope/overlays/rhoai-test/feature/odf/kustomization.yaml deleted file mode 100644 index 7ebd57d0..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/odf/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-storage - -components: - - ../../../../components/nerc-secret-store - -resources: - - ../../../../bundles/odf-external - - externalsecrets/rook-ceph-external-cluster-details.yaml - - redhatcop.redhat.io/odf-node-patcher.yaml - -patches: - - path: storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml diff --git a/cluster-scope/overlays/rhoai-test/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml b/cluster-scope/overlays/rhoai-test/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml deleted file mode 100644 index f6458151..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/odf/redhatcop.redhat.io/odf-node-patcher.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: redhatcop.redhat.io/v1alpha1 -kind: Patch -metadata: - name: odf-node-label-workers - namespace: openshift-storage -spec: - serviceAccountRef: - name: patcher - patches: - odf-node-label-workers: - targetObjectRef: - apiVersion: v1 - kind: Node - labelSelector: - matchLabels: - node-role.kubernetes.io/worker: "" - patchType: application/strategic-merge-patch+json - patchTemplate: | - metadata: - labels: - "cluster.ocs.openshift.io/openshift-storage": "" diff --git a/cluster-scope/overlays/rhoai-test/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml b/cluster-scope/overlays/rhoai-test/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml deleted file mode 100644 index 235dc749..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/odf/storageclasses/ocs-external-storagecluster-ceph-rbd_patch.yaml +++ /dev/null @@ -1,17 +0,0 @@ -allowVolumeExpansion: true -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: ocs-external-storagecluster-ceph-rbd -parameters: - clusterID: openshift-storage - csi.storage.k8s.io/controller-expand-secret-name: rook-csi-rbd-provisioner - csi.storage.k8s.io/controller-expand-secret-namespace: openshift-storage - csi.storage.k8s.io/fstype: ext4 - csi.storage.k8s.io/node-stage-secret-name: rook-csi-rbd-node - csi.storage.k8s.io/node-stage-secret-namespace: openshift-storage - csi.storage.k8s.io/provisioner-secret-name: rook-csi-rbd-provisioner - csi.storage.k8s.io/provisioner-secret-namespace: openshift-storage - imageFeatures: layering - imageFormat: "2" - pool: moc-rbd-rhoai-test diff --git a/cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/datasciencecluster.yaml b/cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/datasciencecluster.yaml deleted file mode 100644 index fd4ab658..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/datasciencecluster.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: datasciencecluster.opendatahub.io/v1 -kind: DataScienceCluster -metadata: - name: default-dsc -spec: - components: - codeflare: - managementState: Removed - dashboard: - managementState: Managed - datasciencepipelines: - managementState: Managed - kserve: - managementState: Managed - serving: - ingressGateway: - certificate: - type: SelfSigned - managementState: Managed - name: knative-serving - kueue: - managementState: Removed - modelmeshserving: - managementState: Managed - ray: - managementState: Removed - trustyai: - managementState: Removed - workbenches: - managementState: Managed diff --git a/cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/kustomization.yaml b/cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/kustomization.yaml deleted file mode 100644 index 15555aee..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/rhoai/datascienceclusters/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - datasciencecluster.yaml diff --git a/cluster-scope/overlays/rhoai-test/feature/rhoai/kustomization.yaml b/cluster-scope/overlays/rhoai-test/feature/rhoai/kustomization.yaml deleted file mode 100644 index 4a1e6446..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/rhoai/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -commonLabels: - nerc.mghpcc.org/feature: rhoai - -resources: - - ../../../../bundles/rhods-operator - - datascienceclusters - - odhdashboardconfigs - -patches: - - path: subscriptions/subscription-patch.yaml diff --git a/cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/kustomization.yaml b/cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/kustomization.yaml deleted file mode 100644 index 4d6efbbe..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - odh-dashboard-config.yaml diff --git a/cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/odh-dashboard-config.yaml b/cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/odh-dashboard-config.yaml deleted file mode 100644 index d4fd0b08..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/rhoai/odhdashboardconfigs/odh-dashboard-config.yaml +++ /dev/null @@ -1,94 +0,0 @@ -apiVersion: opendatahub.io/v1alpha -kind: OdhDashboardConfig -metadata: - labels: - nerc.mghpcc.org/kustomized: "true" - name: odh-dashboard-config - namespace: redhat-ods-applications -spec: - dashboardConfig: - disableBYONImageStream: false - disableClusterManager: false - disableCustomServingRuntimes: false - disableISVBadges: false - disableInfo: true - disableModelServing: false - disablePipelines: false - disableProjectSharing: false - disableProjects: false - disableSupport: true - disableTracking: false - enablement: false - groupsConfig: - adminGroups: rhods-admins - allowedGroups: system:authenticated - modelServerSizes: - - name: Small - resources: - limits: - cpu: "2" - memory: 8Gi - requests: - cpu: "1" - memory: 4Gi - - name: Medium - resources: - limits: - cpu: "8" - memory: 10Gi - requests: - cpu: "4" - memory: 8Gi - - name: Large - resources: - limits: - cpu: "10" - memory: 20Gi - requests: - cpu: "6" - memory: 16Gi - notebookController: - enabled: true - notebookNamespace: rhods-notebooks - pvcSize: 20Gi - notebookSizes: - - name: X Small - resources: - limits: - cpu: '1' - memory: 4Gi - requests: - cpu: '100m' - memory: 1Gi - - name: Small - resources: - limits: - cpu: "2" - memory: 8Gi - requests: - cpu: "1" - memory: 8Gi - - name: Medium - resources: - limits: - cpu: "6" - memory: 24Gi - requests: - cpu: "3" - memory: 24Gi - - name: Large - resources: - limits: - cpu: "14" - memory: 56Gi - requests: - cpu: "7" - memory: 56Gi - - name: X Large - resources: - limits: - cpu: "30" - memory: 120Gi - requests: - cpu: "15" - memory: 120Gi diff --git a/cluster-scope/overlays/rhoai-test/feature/rhoai/subscriptions/subscription-patch.yaml b/cluster-scope/overlays/rhoai-test/feature/rhoai/subscriptions/subscription-patch.yaml deleted file mode 100644 index 7eaee188..00000000 --- a/cluster-scope/overlays/rhoai-test/feature/rhoai/subscriptions/subscription-patch.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: Subscription -metadata: - name: rhods-operator - namespace: redhat-ods-operator -spec: - channel: stable diff --git a/cluster-scope/overlays/rhoai-test/issuers/kustomization.yaml b/cluster-scope/overlays/rhoai-test/issuers/kustomization.yaml deleted file mode 100644 index d0c8594e..00000000 --- a/cluster-scope/overlays/rhoai-test/issuers/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- openshift-config -- openshift-ingress diff --git a/cluster-scope/overlays/rhoai-test/issuers/openshift-config/kustomization.yaml b/cluster-scope/overlays/rhoai-test/issuers/openshift-config/kustomization.yaml deleted file mode 100644 index d362488f..00000000 --- a/cluster-scope/overlays/rhoai-test/issuers/openshift-config/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-config -components: - - ../../../../components/nerc-certificate-issuer diff --git a/cluster-scope/overlays/rhoai-test/issuers/openshift-ingress/kustomization.yaml b/cluster-scope/overlays/rhoai-test/issuers/openshift-ingress/kustomization.yaml deleted file mode 100644 index 4fad3c21..00000000 --- a/cluster-scope/overlays/rhoai-test/issuers/openshift-ingress/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-ingress -components: - - ../../../../components/nerc-certificate-issuer diff --git a/cluster-scope/overlays/rhoai-test/kustomization.yaml b/cluster-scope/overlays/rhoai-test/kustomization.yaml deleted file mode 100644 index a2c518fc..00000000 --- a/cluster-scope/overlays/rhoai-test/kustomization.yaml +++ /dev/null @@ -1,80 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -commonLabels: - nerc.mghpcc.org/kustomized: "true" - -resources: -- ../common -- ../../bundles/node-feature-discovery -- ../../bundles/patch-operator -- ../../bundles/clusterissuer-http01 -- ../../base/rbac.authorization.k8s.io/clusterroles/allow-edit-rbac -- ../../base/core/namespaces/openshift-gitops -- externalsecrets -- issuers -- feature/odf -- certificates -- secretstores - -components: - - ../../components/nerc-oauth-keycloak - - ../../components/nerc-oauth-github - - # this must come last in order to apply - # to all resources. - - ../../components/argocd-skip-dryrun - -generatorOptions: - disableNameSuffixHash: true - -patches: -- patch: | - apiVersion: config.openshift.io/v1 - kind: OAuth - metadata: - name: cluster - spec: - identityProviders: - - name: mss-keycloak - openID: - clientID: rhoai-test - - -- patch: | - apiVersion: config.openshift.io/v1 - kind: OAuth - metadata: - name: cluster - spec: - identityProviders: - - name: github - github: - clientID: -- target: - kind: ExternalSecret - name: github-client-secret - patch: | - - op: replace - path: /spec/data/0/remoteRef/key - value: nerc/rhoai-test/openshift-config/github-client-secret - -- target: - kind: SecretStore - patch: | - - op: replace - path: /spec/provider/vault/auth/kubernetes/mountPath - value: kubernetes/rhoai-test -- target: - kind: ExternalSecret - name: aws-route53-credentials - patch: | - - op: replace - path: /spec/dataFrom/0/extract/key - value: nerc/rhoai-test/aws-route53-credentials -- target: - kind: APIServer - name: cluster - patch: | - - op: replace - path: /spec/servingCerts/namedCertificates/0/names/0 - value: api.rhoai-test.nerc.mghpcc.org diff --git a/cluster-scope/overlays/rhoai-test/secretstores/group-sync-operator/kustomization.yaml b/cluster-scope/overlays/rhoai-test/secretstores/group-sync-operator/kustomization.yaml deleted file mode 100644 index 7c10f7ec..00000000 --- a/cluster-scope/overlays/rhoai-test/secretstores/group-sync-operator/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: group-sync-operator -components: - - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/rhoai-test/secretstores/kustomization.yaml b/cluster-scope/overlays/rhoai-test/secretstores/kustomization.yaml deleted file mode 100644 index 864474c6..00000000 --- a/cluster-scope/overlays/rhoai-test/secretstores/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- openshift-config -- openshift-ingress -- openshift-logging -- group-sync-operator diff --git a/cluster-scope/overlays/rhoai-test/secretstores/openshift-config/kustomization.yaml b/cluster-scope/overlays/rhoai-test/secretstores/openshift-config/kustomization.yaml deleted file mode 100644 index 9975b174..00000000 --- a/cluster-scope/overlays/rhoai-test/secretstores/openshift-config/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-config -components: - - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/rhoai-test/secretstores/openshift-ingress/kustomization.yaml b/cluster-scope/overlays/rhoai-test/secretstores/openshift-ingress/kustomization.yaml deleted file mode 100644 index e36f6c33..00000000 --- a/cluster-scope/overlays/rhoai-test/secretstores/openshift-ingress/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-ingress -components: - - ../../../../components/nerc-secret-store diff --git a/cluster-scope/overlays/rhoai-test/secretstores/openshift-logging/kustomization.yaml b/cluster-scope/overlays/rhoai-test/secretstores/openshift-logging/kustomization.yaml deleted file mode 100644 index 16616f38..00000000 --- a/cluster-scope/overlays/rhoai-test/secretstores/openshift-logging/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: openshift-logging -components: - - ../../../../components/nerc-secret-store