Merge remote-tracking branch 'upstream/main'

Author: m-rafeeq

tests/common/resources/custom-nb-small.yaml

@@ -9,10 +9,9 @@ apiVersion: kubeflow.org/v1
 kind: Notebook
 metadata:
   annotations:
-    notebooks.opendatahub.io/inject-oauth: "true"
+    notebooks.opendatahub.io/inject-auth: "true"
     notebooks.opendatahub.io/last-image-selection: codeflare-notebook:latest
     notebooks.opendatahub.io/last-size-selection: {{.SizeSelection}}
-    notebooks.opendatahub.io/oauth-logout-url: https://odh-dashboard-{{.OpenDataHubNamespace}}.{{.IngressDomain}}/notebookController/kube-3aadmin/home
     opendatahub.io/link: https://jupyter-nb-kube-3aadmin-{{.Namespace}}.{{.IngressDomain}}/notebook/{{.Namespace}}/jupyter-nb-kube-3aadmin
     opendatahub.io/username: kube:admin
   generation: 1
@@ -92,80 +91,12 @@ spec:
         - mountPath: /opt/app-root/notebooks
           name: {{.NotebookConfigMapName}}
         workingDir: /opt/app-root/src
-      - args:
-        - --provider=openshift
-        - --https-address=:8443
-        - --http-address=
-        - --openshift-service-account=jupyter-nb-kube-3aadmin
-        - --cookie-secret-file=/etc/oauth/config/cookie_secret
-        - --cookie-expire=24h0m0s
-        - --tls-cert=/etc/tls/private/tls.crt
-        - --tls-key=/etc/tls/private/tls.key
-        - --upstream=http://localhost:8888
-        - --upstream-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
-        - --skip-auth-regex=^(?:/notebook/$(NAMESPACE)/jupyter-nb-kube-3aadmin)?/api$
-        - --email-domain=*
-        - --skip-provider-button
-        - --openshift-sar={"verb":"get","resource":"notebooks","resourceAPIGroup":"kubeflow.org","resourceName":"jupyter-nb-kube-3aadmin","namespace":"$(NAMESPACE)"}
-        - --logout-url=https://odh-dashboard-{{.OpenDataHubNamespace}}.{{.IngressDomain}}/notebookController/kube-3aadmin/home
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-        image: registry.redhat.io/openshift4/ose-oauth-proxy:v4.10
-        imagePullPolicy: Always
-        livenessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /oauth/healthz
-            port: oauth-proxy
-            scheme: HTTPS
-          initialDelaySeconds: 30
-          periodSeconds: 5
-          successThreshold: 1
-          timeoutSeconds: 1
-        name: oauth-proxy
-        ports:
-        - containerPort: 8443
-          name: oauth-proxy
-          protocol: TCP
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /oauth/healthz
-            port: oauth-proxy
-            scheme: HTTPS
-          initialDelaySeconds: 5
-          periodSeconds: 5
-          successThreshold: 1
-          timeoutSeconds: 1
-        resources:
-          limits:
-            cpu: 100m
-            memory: 64Mi
-          requests:
-            cpu: 100m
-            memory: 64Mi
-        volumeMounts:
-        - mountPath: /etc/oauth/config
-          name: oauth-config
-        - mountPath: /etc/tls/private
-          name: tls-certificates
       enableServiceLinks: false
       serviceAccountName: jupyter-nb-kube-3aadmin
       volumes:
       - name: jupyterhub-nb-kube-3aadmin-pvc
         persistentVolumeClaim:
           claimName: {{.NotebookPVC}}
-      - name: oauth-config
-        secret:
-          defaultMode: 420
-          secretName: jupyter-nb-kube-3aadmin-oauth-config
-      - name: tls-certificates
-        secret:
-          defaultMode: 420
-          secretName: jupyter-nb-kube-3aadmin-tls
       - name: {{.NotebookConfigMapName}}
         configMap:
           name: {{.NotebookConfigMapName}}