Skip to content

Fix e2e test after removal of controller manager. #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 1 commit into from
Aug 13, 2018
Merged

Fix e2e test after removal of controller manager. #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/config-logging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 0 additions & 4 deletions pkg/logconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
6 changes: 2 additions & 4 deletions test/e2e-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down