Skip to content
This repository was archived by the owner on Jan 31, 2024. It is now read-only.

Commit edc29bc

Browse files
authored
Update odh-dashboard manifests for dashboard v2.0 release (#588)
Add odh-dashboard v2.0 files * odh-dashboard: Set authentication overlay as the default deployment method * Add real defaults to JH groups config * Add odh-jupyterhub-admins as the default admin_groups * Add system:authenticated as the default allowed_groups * Add check for ODHDashboardConfigs in the dashboard CI test Signed-off-by: Landon LaSmith <LLaSmith@redhat.com>
1 parent 513a56a commit edc29bc

File tree

8 files changed

+63
-8
lines changed

8 files changed

+63
-8
lines changed

jupyterhub/jupyterhub/base/jupyterhub-groups-configmap.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ metadata:
55
app: jupyterhub
66
name: jupyterhub-default-groups-config
77
data:
8-
admin_groups: ""
9-
allowed_groups: ""
8+
admin_groups: "odh-jupyterhub-admins"
9+
allowed_groups: "system:authenticated"

kfdef/kfctl_openshift.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ spec:
100100
path: model-mesh
101101
name: model-mesh
102102
- kustomizeConfig:
103+
overlays:
104+
- authentication
103105
repoRef:
104106
name: manifests
105107
path: odh-dashboard

odh-dashboard/base/cluster-role-binding.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ metadata:
55
subjects:
66
- kind: ServiceAccount
77
name: odh-dashboard
8-
namespace: redhat-ods-applications
98
roleRef:
109
apiGroup: rbac.authorization.k8s.io
1110
kind: ClusterRole

odh-dashboard/base/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccount: odh-dashboard
2828
containers:
2929
- name: odh-dashboard
30-
image: quay.io/opendatahub/odh-dashboard:v1.0
30+
image: quay.io/opendatahub/odh-dashboard:v2.0
3131
imagePullPolicy: Always
3232
ports:
3333
- containerPort: 8080

odh-dashboard/base/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ commonLabels:
44
app: odh-dashboard
55
app.kubernetes.io/part-of: odh-dashboard
66
resources:
7+
- odh-dashboard-crd.yaml
78
- role.yaml
89
- cluster-role.yaml
910
- service-account.yaml
@@ -12,4 +13,3 @@ resources:
1213
- deployment.yaml
1314
- routes.yaml
1415
- service.yaml
15-
- odh-dashboard-crd.yaml

odh-dashboard/base/role.yaml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,53 @@ rules:
1919
- get
2020
- list
2121
- watch
22+
- apiGroups:
23+
- ''
24+
verbs:
25+
- create
26+
- delete
27+
- get
28+
- list
29+
- patch
30+
- update
31+
- watch
32+
resources:
33+
- configmaps
34+
- secrets
35+
- apiGroups:
36+
- batch
37+
verbs:
38+
- create
39+
- delete
40+
- get
41+
- list
42+
- patch
43+
- update
44+
- watch
45+
resources:
46+
- cronjobs
47+
- jobs
48+
- jobs/status
49+
- apiGroups:
50+
- image.openshift.io
51+
verbs:
52+
- create
53+
- get
54+
- list
55+
- update
56+
- patch
57+
- delete
58+
resources:
59+
- imagestreams
2260
- apiGroups:
2361
- build.openshift.io
2462
verbs:
2563
- get
2664
- list
2765
- watch
66+
- create
67+
- patch
68+
- delete
2869
resources:
2970
- builds
3071
- buildconfigs
@@ -48,3 +89,15 @@ rules:
4889
resources:
4990
- deploymentconfigs
5091
- deploymentconfigs/instantiate
92+
- apiGroups:
93+
- opendatahub.io
94+
verbs:
95+
- get
96+
- list
97+
- watch
98+
- create
99+
- update
100+
- patch
101+
- delete
102+
resources:
103+
- odhdashboardconfigs

odh-dashboard/overlays/authentication/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
- --cookie-secret=SECRET
1313
- '--openshift-delegate-urls={"/": {"resource": "route", "verb": "get", "name": "odh-dashboard"}}'
1414
- --skip-auth-regex=^/metrics
15-
image: quay.io/openshift/origin-oauth-proxy:4.8.0
15+
image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.8
1616
ports:
1717
- containerPort: 8443
1818
name: https

tests/basictests/dashboard.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ function check_resources() {
1212
header "Testing dashboard installation"
1313
os::cmd::expect_success "oc project ${ODHPROJECT}"
1414
os::cmd::try_until_text "oc get odh-dashboard odh-dashboard" "odh-dashboard" $odhdefaulttimeout $odhdefaultinterval
15+
os::cmd::try_until_text "oc get crd odhdashboardconfigs " "odhdashboardconfigs" $odhdefaulttimeout $odhdefaultinterval
1516
os::cmd::try_until_text "oc get role odh-dashboard" "odh-dashboard" $odhdefaulttimeout $odhdefaultinterval
1617
os::cmd::try_until_text "oc get rolebinding odh-dashboard" "odh-dashboard" $odhdefaulttimeout $odhdefaultinterval
1718
os::cmd::try_until_text "oc get route odh-dashboard" "odh-dashboard" $odhdefaulttimeout $odhdefaultinterval
@@ -26,8 +27,8 @@ function check_ui() {
2627
local route="https://"$(oc get route odh-dashboard -o jsonpath='{.spec.host}')
2728
os::log::info "$route"
2829
os::cmd::try_until_text "curl -k -s -o /dev/null -w \"%{http_code}\" $route/api/components" "200" $odhdefaulttimeout $odhdefaultinterval
29-
os::cmd::try_until_text "curl -k $route/api/components | jq '.[].key'" "jupyterhub" $odhdefaulttimeout $odhdefaultinterval
30-
os::cmd::try_until_text "curl -k $route" "<title>Open Data Hub Dashboard</title>" $odhdefaulttimeout $odhdefaultinterval
30+
os::cmd::try_until_text "curl -k $route/api/components | jq '.[].metadata.name'" "jupyterhub" $odhdefaulttimeout $odhdefaultinterval
31+
os::cmd::try_until_text "curl -k $route" "<title>Open Data Hub</title>" $odhdefaulttimeout $odhdefaultinterval
3132
}
3233

3334
check_resources

0 commit comments

Comments
 (0)