Skip to content

Commit

Permalink
Merge pull request #291 from mbaldessari/quick-fixes
Browse files Browse the repository at this point in the history
ds-pipeline-config fixes and url fixes
  • Loading branch information
mbaldessari authored Nov 7, 2024
2 parents f33a9e3 + 2caf5cd commit ef8b550
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ metadata:
notebooks.opendatahub.io/inject-oauth: 'true'
notebooks.opendatahub.io/last-size-selection: Small
notebooks.opendatahub.io/oauth-logout-url: >-
https://rhods-dashboard-redhat-ods-applications.apps.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=jupyterlab
https://rhods-dashboard-redhat-ods-applications.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=jupyterlab
opendatahub.io/username: 'user'
openshift.io/description: ''
openshift.io/display-name: JupyterLab
Expand Down Expand Up @@ -149,7 +149,7 @@ spec:
--ServerApp.password=''
--ServerApp.base_url=/notebook/ml-development/jupyterlab
--ServerApp.quit_button=False
--ServerApp.tornado_settings={"user":"user","hub_host":"https://rhods-dashboard-redhat-ods-applications.apps.{{ .Values.global.localClusterDomain }}","hub_prefix":"/projects/ml-development"}
--ServerApp.tornado_settings={"user":"user","hub_host":"https://rhods-dashboard-redhat-ods-applications.{{ .Values.global.localClusterDomain }}","hub_prefix":"/projects/ml-development"}
- name: JUPYTER_IMAGE
value: image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/industrial-edge:industrial-edge-v0.1.0
- name: SSL_CERT_FILE
Expand Down Expand Up @@ -241,7 +241,7 @@ spec:
- >-
--openshift-sar={"verb":"get","resource":"notebooks","resourceAPIGroup":"kubeflow.org","resourceName":"jupyterlab","namespace":"$(NAMESPACE)"}
- >-
--logout-url=https://rhods-dashboard-redhat-ods-applications.apps.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=jupyterlab
--logout-url=https://rhods-dashboard-redhat-ods-applications.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=jupyterlab
enableServiceLinks: false
serviceAccountName: jupyterlab
volumes:
Expand All @@ -250,7 +250,7 @@ spec:
claimName: workbench-pvc
- name: elyra-dsp-details
secret:
secretName: ds-pipeline-config
secretName: ds-pipeline-config-custom
- emptyDir:
medium: Memory
name: shm
Expand Down Expand Up @@ -328,7 +328,7 @@ metadata:
notebooks.opendatahub.io/inject-oauth: 'true'
notebooks.opendatahub.io/last-size-selection: Small
notebooks.opendatahub.io/oauth-logout-url: >-
https://rhods-dashboard-redhat-ods-applications.apps.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=s3-browser
https://rhods-dashboard-redhat-ods-applications.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=s3-browser
opendatahub.io/username: 'user'
openshift.io/description: ''
openshift.io/display-name: 'S3 Browser'
Expand Down Expand Up @@ -389,7 +389,7 @@ spec:
--ServerApp.password=''
--ServerApp.base_url=/notebook/ml-development/s3-browser
--ServerApp.quit_button=False
--ServerApp.tornado_settings={"user":"user","hub_host":"https://rhods-dashboard-redhat-ods-applications.apps.{{ .Values.global.localClusterDomain }}","hub_prefix":"/projects/ml-development"}
--ServerApp.tornado_settings={"user":"user","hub_host":"https://rhods-dashboard-redhat-ods-applications.{{ .Values.global.localClusterDomain }}","hub_prefix":"/projects/ml-development"}
- name: JUPYTER_IMAGE
value: image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/odh-tec:v0.1
- name: SSL_CERT_FILE
Expand Down Expand Up @@ -482,7 +482,7 @@ spec:
- >-
--openshift-sar={"verb":"get","resource":"notebooks","resourceAPIGroup":"kubeflow.org","resourceName":"s3-browser","namespace":"$(NAMESPACE)"}
- >-
--logout-url=https://rhods-dashboard-redhat-ods-applications.apps.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=s3-browser
--logout-url=https://rhods-dashboard-redhat-ods-applications.{{ .Values.global.localClusterDomain }}/projects/ml-development?notebookLogout=s3-browser
enableServiceLinks: false
serviceAccountName: s3-browser
volumes:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# At the moment it seems that the ds-pipeline-config secret only
# gets generated by the RHOAI dashboard once you log in and click around
# Until it is a bit more gitops friendly, let's create it ourselves
---
apiVersion: v1
kind: ConfigMap
metadata:
name: ds-pipeline-config-custom-tpl
data:
odh_dsp.json: |
{
"display_name": "Data Science Pipeline",
"metadata": {
"tags": [],
"display_name": "Data Science Pipeline",
"engine": "Argo",
"auth_type": "KUBERNETES_SERVICE_ACCOUNT_TOKEN",
"api_endpoint": "https://ds-pipeline-dspa-ml-development.{{ .Values.global.localClusterDomain }}",
"public_api_endpoint": "https://rhods-dashboard-redhat-ods-applications.{{ .Values.global.localClusterDomain }}/experiments/ml-development/",
"cos_auth_type": "KUBERNETES_SECRET",
"cos_secret": "aws-connection-pipeline-bucket",
"cos_endpoint": "http://s3.openshift-storage.svc.cluster.local",
"cos_bucket": "pipeline-bucket",
"cos_username": "{{ `{{ .aws_access_key_id }}` }}",
"cos_password": "{{ `{{ .aws_secret_access_key }}` }}",
"runtime_type": "KUBEFLOW_PIPELINES"
},
"schema_name": "kfp"
}
---
apiVersion: "external-secrets.io/v1beta1"
kind: ExternalSecret
metadata:
name: ds-pipeline-config-custom
namespace: ml-development
spec:
refreshInterval: 15s
secretStoreRef:
name: {{ $.Values.secretStore.name }}
kind: {{ $.Values.secretStore.kind }}
target:
name: ds-pipeline-config-custom
template:
type: Opaque
engineVersion: v2
templateFrom:
- target: Data
configMap:
name: ds-pipeline-config-custom-tpl
items:
- key: odh_dsp.json
templateAs: Values
data:
- secretKey: aws_secret_access_key
remoteRef:
key: "pushsecrets/pipeline-bucket"
property: "AWS_SECRET_ACCESS_KEY"

- secretKey: aws_access_key_id
remoteRef:
key: "pushsecrets/pipeline-bucket"
property: "AWS_ACCESS_KEY_ID"

0 comments on commit ef8b550

Please sign in to comment.