From ac738de76cfd7dac2e0b26cb628847d67757b563 Mon Sep 17 00:00:00 2001 From: Harshad Reddy Nalla Date: Mon, 11 Sep 2023 11:58:33 -0400 Subject: [PATCH] Revert "Remove skip-provider-button flag from oauth configs" This reverts commit fb769e53ec58fa7ba6a27655e2949d8aa075a518. --- .../controllers/notebook_controller_test.go | 1 + .../odh-notebook-controller/controllers/notebook_webhook.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/odh-notebook-controller/controllers/notebook_controller_test.go b/components/odh-notebook-controller/controllers/notebook_controller_test.go index b45adc2bda7..869068945b3 100644 --- a/components/odh-notebook-controller/controllers/notebook_controller_test.go +++ b/components/odh-notebook-controller/controllers/notebook_controller_test.go @@ -439,6 +439,7 @@ var _ = Describe("The Openshift Notebook controller", func() { "--upstream=http://localhost:8888", "--upstream-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt", "--email-domain=*", + "--skip-provider-button", `--openshift-sar={"verb":"get","resource":"notebooks","resourceAPIGroup":"kubeflow.org",` + `"resourceName":"` + Name + `","namespace":"$(NAMESPACE)"}`, "--logout-url=https://example.notebook-url/notebook/" + Namespace + "/" + Name, diff --git a/components/odh-notebook-controller/controllers/notebook_webhook.go b/components/odh-notebook-controller/controllers/notebook_webhook.go index 91b7a76197f..358ebc1f754 100644 --- a/components/odh-notebook-controller/controllers/notebook_webhook.go +++ b/components/odh-notebook-controller/controllers/notebook_webhook.go @@ -19,9 +19,8 @@ import ( "context" "encoding/json" "fmt" - "net/http" - configv1 "github.com/openshift/api/config/v1" + "net/http" nbv1 "github.com/kubeflow/kubeflow/components/notebook-controller/api/v1" "github.com/kubeflow/kubeflow/components/notebook-controller/pkg/culler" @@ -92,6 +91,7 @@ func InjectOAuthProxy(notebook *nbv1.Notebook, oauth OAuthConfig) error { "--upstream=http://localhost:8888", "--upstream-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt", "--email-domain=*", + "--skip-provider-button", `--openshift-sar={"verb":"get","resource":"notebooks","resourceAPIGroup":"kubeflow.org",` + `"resourceName":"` + notebook.Name + `","namespace":"$(NAMESPACE)"}`, },