From 8fb6d0544c79a4deb9f4d08cf897b3c56ad5d6b7 Mon Sep 17 00:00:00 2001 From: Scott Nichols Date: Mon, 13 Aug 2018 10:18:34 -0700 Subject: [PATCH] Fix e2e test after removal of controller manager. --- config/config-logging.yaml | 1 - pkg/logconfig/config.go | 4 ---- test/e2e-tests.sh | 6 ++---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/config/config-logging.yaml b/config/config-logging.yaml index c0df2b75dcc..a742cb7ae90 100644 --- a/config/config-logging.yaml +++ b/config/config-logging.yaml @@ -44,5 +44,4 @@ data: # Log level overrides # For all components changes are be picked up immediately. loglevel.controller: "info" - loglevel.controller-manager: "info" loglevel.webhook: "info" diff --git a/pkg/logconfig/config.go b/pkg/logconfig/config.go index f1f5237b767..61abd3dec98 100644 --- a/pkg/logconfig/config.go +++ b/pkg/logconfig/config.go @@ -23,15 +23,11 @@ const ( // Named Loggers are used to override the default log level. config-logging.yaml will use the follow: // // loglevel.controller: "info" - // loglevel.controller-manager: "info" // loglevel.webhook: "info" // Controller is the name of the override key used inside of the logging config for Controller. Controller = "controller" - // ControllerManager is the name of the override key used inside of the logging config for Controller Manager. - ControllerManager = "controller-manager" - // Webhook is the name of the override key used inside of the logging config for Webhook Controller. Webhook = "webhook" ) diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh index 957d3329015..64943f10f37 100755 --- a/test/e2e-tests.sh +++ b/test/e2e-tests.sh @@ -72,10 +72,8 @@ function wait_until_flow_ready() { kubectl get -n $NAMESPACE flows $NAME -oyaml kubectl get -n $NAMESPACE jobs $NAME-start -oyaml kubectl get -n $NAMESPACE feeds $NAME -oyaml - echo -e "Dumping controller manager logs" - kubectl -n knative-eventing logs `kubectl -n knative-eventing get pods -oname | grep controller-manager` controller-manager - echo -e "Dumping controller logs" - kubectl -n knative-eventing logs `kubectl -n knative-eventing get pods -oname | grep eventing-controller` + echo -e "Dumping eventing controller logs" + kubectl -n knative-eventing logs `kubectl -n knative-eventing get pods -oname | grep eventing-controller` eventing-controller return 1 }