From 9b5ce7086229680d6837c6279706b38cbcc74564 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 6 Nov 2024 12:20:45 +0100 Subject: [PATCH 1/2] Make sure the aws-connection-* secrets are in ml-test and ml-development --- .../templates/dataconnection-secrets.yaml | 13 +++++++++++-- charts/datacenter/data-science-project/values.yaml | 4 ---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/charts/datacenter/data-science-project/templates/dataconnection-secrets.yaml b/charts/datacenter/data-science-project/templates/dataconnection-secrets.yaml index cd6269fdd..581db4eaf 100644 --- a/charts/datacenter/data-science-project/templates/dataconnection-secrets.yaml +++ b/charts/datacenter/data-science-project/templates/dataconnection-secrets.yaml @@ -1,4 +1,11 @@ -{{- range $i := .Values.bucketSecrets }} +{{/* +We fetch the secrets of the s3 buckets called pipeline-bucket and user-bucket +from the ml-development namespace. Then we extract them in a more extended form +into their corresponding aws-connection-user-bucket and aws-connection-pipeline-bucket +and these two aws-connection-* secrets are replicated in ml-development and ml-test +namespaces +*/}} +{{- range $i := list "pipeline-bucket" "user-bucket" }} --- apiVersion: external-secrets.io/v1alpha1 kind: PushSecret @@ -28,12 +35,13 @@ spec: secret: name: {{ $i }} updatePolicy: Replace +{{- range $j := list "ml-development" "manuela-tst-all" }} --- apiVersion: "external-secrets.io/v1beta1" kind: ExternalSecret metadata: name: s3-{{ $i }} - namespace: ml-development + namespace: {{ $j }} spec: refreshInterval: 15s secretStoreRef: @@ -67,3 +75,4 @@ spec: key: "pushsecrets/{{ $i }}" property: "AWS_ACCESS_KEY_ID" {{- end }} +{{- end }} diff --git a/charts/datacenter/data-science-project/values.yaml b/charts/datacenter/data-science-project/values.yaml index e2bbcbb8e..b08ee9d75 100644 --- a/charts/datacenter/data-science-project/values.yaml +++ b/charts/datacenter/data-science-project/values.yaml @@ -8,10 +8,6 @@ secretStore: name: vault-backend kind: ClusterSecretStore -bucketSecrets: - - pipeline-bucket - - user-bucket - s3: default_endpoint: http://s3.openshift-storage.svc default_region: none From 2eaa6258ba428b5e6f5d4a511987a51293375d49 Mon Sep 17 00:00:00 2001 From: Michele Baldessari Date: Wed, 6 Nov 2024 12:23:02 +0100 Subject: [PATCH 2/2] Drop opendatahub application --- charts/datacenter/opendatahub/Chart.yaml | 6 -- .../templates/manuela-admin-rolebinding.yaml | 16 ---- .../templates/manuela-view-rolebinding.yaml | 12 --- .../opendatahub/templates/odh-dashboard.yaml | 20 ----- .../opendatahub/templates/odh-kfdef.yaml | 73 ------------------- charts/datacenter/opendatahub/values.yaml | 2 - values-datacenter.yaml | 6 -- 7 files changed, 135 deletions(-) delete mode 100644 charts/datacenter/opendatahub/Chart.yaml delete mode 100644 charts/datacenter/opendatahub/templates/manuela-admin-rolebinding.yaml delete mode 100644 charts/datacenter/opendatahub/templates/manuela-view-rolebinding.yaml delete mode 100644 charts/datacenter/opendatahub/templates/odh-dashboard.yaml delete mode 100644 charts/datacenter/opendatahub/templates/odh-kfdef.yaml delete mode 100644 charts/datacenter/opendatahub/values.yaml diff --git a/charts/datacenter/opendatahub/Chart.yaml b/charts/datacenter/opendatahub/Chart.yaml deleted file mode 100644 index be630cdf7..000000000 --- a/charts/datacenter/opendatahub/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -description: A Helm chart to configure OpenDataHub -keywords: -- patterns -name: opendatahub -version: 0.0.1 diff --git a/charts/datacenter/opendatahub/templates/manuela-admin-rolebinding.yaml b/charts/datacenter/opendatahub/templates/manuela-admin-rolebinding.yaml deleted file mode 100644 index 8fc44301a..000000000 --- a/charts/datacenter/opendatahub/templates/manuela-admin-rolebinding.yaml +++ /dev/null @@ -1,16 +0,0 @@ -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: admin -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- apiGroup: rbac.authorization.k8s.io - kind: Group - name: manuela-team -- apiGroup: rbac.authorization.k8s.io - kind: Group - name: manuela-dev - diff --git a/charts/datacenter/opendatahub/templates/manuela-view-rolebinding.yaml b/charts/datacenter/opendatahub/templates/manuela-view-rolebinding.yaml deleted file mode 100644 index ddfa1ff38..000000000 --- a/charts/datacenter/opendatahub/templates/manuela-view-rolebinding.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: view -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: view -subjects: -- apiGroup: rbac.authorization.k8s.io - kind: Group - name: manuela-ops diff --git a/charts/datacenter/opendatahub/templates/odh-dashboard.yaml b/charts/datacenter/opendatahub/templates/odh-dashboard.yaml deleted file mode 100644 index bf7d786c2..000000000 --- a/charts/datacenter/opendatahub/templates/odh-dashboard.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: opendatahub.io/v1alpha -kind: OdhDashboardConfig -metadata: - name: odh-dashboard-config - namespace: manuela-ml-workspace -spec: - dashboardConfig: - disableBYONImageStream: false - disableClusterManager: false - disableISVBadges: false - disableInfo: false - disableSupport: false - disableTracking: false - disableUserManagement: false - enablement: true - groupsConfig: - adminGroups: odh-admins - allowedGroups: 'system:authenticated' - notebookController: - enabled: true diff --git a/charts/datacenter/opendatahub/templates/odh-kfdef.yaml b/charts/datacenter/opendatahub/templates/odh-kfdef.yaml deleted file mode 100644 index ab1be51fa..000000000 --- a/charts/datacenter/opendatahub/templates/odh-kfdef.yaml +++ /dev/null @@ -1,73 +0,0 @@ -apiVersion: kfdef.apps.kubeflow.org/v1 -kind: KfDef -metadata: - finalizers: - - kfdef-finalizer.kfdef.apps.kubeflow.org - name: opendatahub -spec: - applications: - - kustomizeConfig: - repoRef: - name: manifests - path: odh-common - name: odh-common - - kustomizeConfig: - overlays: - - authentication - repoRef: - name: manifests - path: odh-dashboard - name: odh-dashboard - - kustomizeConfig: - repoRef: - name: manifests - path: odh-notebook-controller - name: odh-notebook-controller - - kustomizeConfig: - overlays: - - odh-model-controller - repoRef: - name: manifests - path: model-mesh - name: model-mesh - - kustomizeConfig: - overlays: - - metadata-store-mariadb - - ds-pipeline-ui - - object-store-minio - - default-configs - repoRef: - name: manifests - path: data-science-pipelines - name: ds-pipelines - - kustomizeConfig: - repoRef: - name: manifests - path: grafana/cluster - name: grafana-cluster - - kustomizeConfig: - repoRef: - name: manifests - path: grafana/grafana - name: grafana-instance - - kustomizeConfig: - repoRef: - name: manifests - path: prometheus/cluster - name: prometheus-cluster - - kustomizeConfig: - repoRef: - name: manifests - path: prometheus/operator - name: prometheus-operator - - kustomizeConfig: - overlays: - - additional - repoRef: - name: manifests - path: jupyterhub/notebook-images - name: notebook-images - repos: - - name: manifests - uri: https://github.com/opendatahub-io/odh-manifests/tarball/v1.4 - version: v1.4.0 diff --git a/charts/datacenter/opendatahub/values.yaml b/charts/datacenter/opendatahub/values.yaml deleted file mode 100644 index c84a85568..000000000 --- a/charts/datacenter/opendatahub/values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -global: - namespace: ml diff --git a/values-datacenter.yaml b/values-datacenter.yaml index 3ebe2e806..d1687b39a 100644 --- a/values-datacenter.yaml +++ b/values-datacenter.yaml @@ -98,12 +98,6 @@ clusterGroup: jsonPointers: - /spec/loggingCA - #odh: - #name: odh - #namespace: manuela-ml-workspace - #project: datacenter - #path: charts/datacenter/opendatahub - pipelines: name: pipelines namespace: manuela-ci