Fetch upstream Mon Aug 1 13:33:18 CEST 2022 (#230)

red-hat-data-services · Aug 1, 2022 · 6212b2f · 6212b2f
1 parent 3d270ea
commit 6212b2f
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 45 deletions.
diff --git a/odh-dashboard/base/cluster-role.yaml b/odh-dashboard/base/cluster-role.yaml
@@ -8,7 +8,7 @@ rules:
       - watch
       - list
     apiGroups:
-      - ""
+      - ''
       - config.openshift.io
     resources:
       - clusterversions
@@ -21,15 +21,20 @@ rules:
     resources:
       - clusterserviceversions
       - subscriptions
-  - verbs:
+  - apiGroups:
+      - ''
+    verbs:
+      - create
+      - delete
       - get
       - list
+      - patch
+      - update
       - watch
-    apiGroups:
-      - ""
     resources:
-      - services
       - configmaps
+      - persistentvolumeclaims
+      - secrets
   - verbs:
       - get
       - list
@@ -59,7 +64,7 @@ rules:
       - watch
       - list
     apiGroups:
-      - ""
+      - ''
       - integreatly.org
     resources:
       - rhmis
@@ -76,10 +81,34 @@ rules:
       - list
       - watch
     apiGroups:
-      - ""
+      - ''
     resources:
       - pods
       - serviceaccounts
-      - secrets
       - services
       - namespaces
+  - apiGroups:
+      - rbac.authorization.k8s.io
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
+    resources:
+      - rolebindings
+      - roles
+  - apiGroups:
+      - kubeflow.org
+    verbs:
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
+    resources:
+      - notebooks
diff --git a/odh-dashboard/base/deployment.yaml b/odh-dashboard/base/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       serviceAccount: rhods-dashboard
       containers:
       - name: rhods-dashboard
-        image: quay.io/modh/odh-dashboard:v1.0.11
+        image: rhods-dashboard
         imagePullPolicy: Always
         ports:
         - containerPort: 8080

diff --git a/odh-dashboard/base/odh-dashboard-crd.yaml b/odh-dashboard/base/odh-dashboard-crd.yaml
@@ -71,6 +71,8 @@ spec:
                   properties:
                     enabled:
                       type: boolean
+                    notebookNamespace:
+                      type: string
                     gpuConfig:
                       type: object
                       properties:
@@ -81,6 +83,9 @@ spec:
                       properties:
                         enabled: 
                           type: boolean
+            status:
+              type: object
+              properties:
                 notebookControllerState:
                   type: array
                   items:
@@ -92,14 +97,3 @@ spec:
                         type: string
                       lastSelectedSize:
                         type: string
-                      environmentVariables:
-                        type: array
-                        items:
-                          type: object
-                          properties:
-                            key:
-                              type: string
-                            value: 
-                              type: string
-                      secrets:
-                        type: string
diff --git a/odh-dashboard/base/role.yaml b/odh-dashboard/base/role.yaml
@@ -19,20 +19,6 @@ rules:
       - get
       - list
       - watch
-  - apiGroups:
-      - ''
-    verbs:
-      - create
-      - delete
-      - get
-      - list
-      - patch
-      - update
-      - watch
-    resources:
-      - configmaps
-      - persistentvolumeclaims
-      - secrets
   - apiGroups:
       - batch
     verbs:
@@ -71,12 +57,13 @@ rules:
       - builds
       - buildconfigs
       - buildconfigs/instantiate
-  - verbs:
-      - list
-    apiGroups:
-      - rbac.authorization.k8s.io
+  - apiGroups:
+      - apps
+    verbs:
+      - patch
+      - update
     resources:
-      - rolebindings
+      - deployments
   - apiGroups:
       - apps.openshift.io
     verbs:

diff --git a/odh-dashboard/overlays/authentication/deployment.yaml b/odh-dashboard/overlays/authentication/deployment.yaml
@@ -9,10 +9,11 @@
       - --upstream=http://localhost:8080
       - --tls-cert=/etc/tls/private/tls.crt
       - --tls-key=/etc/tls/private/tls.key
-      - --cookie-secret=SECRET
+      - --cookie-secret-file=/etc/oauth/config/cookie_secret
+      - --pass-access-token
       - '--openshift-delegate-urls={"/": {"resource": "route", "verb": "get", "name": "rhods-dashboard"}}'
       - --skip-auth-regex=^/metrics
-    image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.8
+    image: oauth-proxy
     ports:
       - containerPort: 8443
         name: https
@@ -46,9 +47,15 @@
     volumeMounts:
       - mountPath: /etc/tls/private
         name: proxy-tls
+      - mountPath: /etc/oauth/config
+        name: oauth-config
+
 - op: add
   path: /spec/template/spec/volumes
   value:
     - name: proxy-tls
       secret:
         secretName: dashboard-proxy-tls
+    - name: oauth-config
+      secret:
+        secretName: dashboard-oauth-config
diff --git a/odh-dashboard/overlays/authentication/kustomization.yaml b/odh-dashboard/overlays/authentication/kustomization.yaml
@@ -4,6 +4,7 @@ bases:
   - ../../base
 resources:
   - clusterrolebinding.yaml
+  - secret.yaml
 patchesJson6902:
   - path: deployment.yaml
     target:
@@ -27,3 +28,7 @@ patchesJson6902:
       kind: Route
       name: rhods-dashboard
     path: route.yaml
+images:
+- name: oauth-proxy
+  newName: registry.redhat.io/openshift4/ose-oauth-proxy
+  newTag: v4.8
diff --git a/odh-dashboard/overlays/authentication/secret.yaml b/odh-dashboard/overlays/authentication/secret.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dashboard-oauth-config
+type: Opaque
+data:
+  cookie_secret: VGtob01rbFVkRzFJUkdwNlkyTm1jSEZMZVdOQmR6MDk=
diff --git a/odh-notebook-controller/gen_kubeflow_manifests.sh b/odh-notebook-controller/gen_kubeflow_manifests.sh
@@ -5,7 +5,7 @@ ctrl_dir="kf-notebook-controller"
 ctrl_repository="github.com/opendatahub-io/kubeflow"
 ctrl_branch="master"
 ctrl_image="quay.io/opendatahub/kubeflow-notebook-controller"
-ctrl_tag="1.6-57a7a0d"
+ctrl_tag="1.6-825bfe2"
 ctrl_namespace="opendatahub"
 
 cleanup() {

diff --git a/odh-notebook-controller/gen_odh_manifests.sh b/odh-notebook-controller/gen_odh_manifests.sh
@@ -5,7 +5,7 @@ ctrl_dir="odh-notebook-controller"
 ctrl_repository="github.com/opendatahub-io/kubeflow"
 ctrl_branch="master"
 ctrl_image="quay.io/opendatahub/odh-notebook-controller"
-ctrl_tag="1.6-57a7a0d"
+ctrl_tag="1.6-825bfe2"
 ctrl_namespace="opendatahub"
 
 cleanup() {

diff --git a/odh-notebook-controller/kf-notebook-controller/overlays/openshift/kustomization.yaml b/odh-notebook-controller/kf-notebook-controller/overlays/openshift/kustomization.yaml
@@ -11,7 +11,7 @@ commonLabels:
 images:
   - name: public.ecr.aws/j1r0q0g6/notebooks/notebook-controller
     newName: quay.io/opendatahub/kubeflow-notebook-controller
-    newTag: 1.6-57a7a0d
+    newTag: 1.6-825bfe2
 configMapGenerator:
   - name: config
     behavior: merge

diff --git a/odh-notebook-controller/odh-notebook-controller/base/kustomization.yaml b/odh-notebook-controller/odh-notebook-controller/base/kustomization.yaml
@@ -6,4 +6,4 @@ resources:
 images:
   - name: quay.io/opendatahub/odh-notebook-controller
     newName: quay.io/opendatahub/odh-notebook-controller
-    newTag: 1.6-57a7a0d
+    newTag: 1.6-825bfe2