Skip to content
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

Jump to bottom

Rebase to 1.9.1 #18003

Merged
merged 6 commits into from
Jan 10, 2018
Merged

Rebase to 1.9.1 #18003

merged 6 commits into from
Jan 10, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jan 5, 2018

/assign mfojtik
/assign soltysh

@soltysh the audit options probably deserve better wiring.

I wonder if it is this simple....

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 5, 2018
@openshift-merge-robot openshift-merge-robot added needs-api-review vendor-update Touching vendor dir or related files labels Jan 5, 2018
soltysh
soltysh reviewed Jan 8, 2018
View reviewed changes
vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go Outdated
@@ -421,7 +421,7 @@ func GetAvailableResources(clientBuilder controller.ControllerClientBuilder) (ma
// CreateControllerContext creates a context struct containing references to resources needed by the
// controllers such as the cloud provider and clientBuilder. rootClientBuilder is only used for
// the shared-informers client and token controller.
func CreateControllerContext(s *options.CMServer, rootClientBuilder, clientBuilder controller.ControllerClientBuilder, stop <-chan struct{}) (ControllerContext, error) {
func createControllerContext(s *options.CMServer, rootClientBuilder, clientBuilder controller.ControllerClientBuilder, stop <-chan struct{}) (ControllerContext, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this carry replaces ce08d2f ?

pkg/cmd/server/kubernetes/master/master_config.go
@@ -819,7 +820,7 @@ func GetAuditConfig(auditConfig configapi.AuditConfig) (audit.Backend, auditpoli

// webhook configuration, only when config file was provided
if len(auditConfig.WebHookKubeConfig) > 0 {
webhook, err := auditwebhook.NewBackend(auditConfig.WebHookKubeConfig, string(auditConfig.WebHookMode), auditv1beta1.SchemeGroupVersion)
webhook, err := auditwebhook.NewBackend(auditConfig.WebHookKubeConfig, string(auditConfig.WebHookMode), auditv1beta1.SchemeGroupVersion, pluginwebhook.NewDefaultBatchBackendConfig())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's ok to start with. But I'll open a followup and we'll externalize these configs.

@deads2k
Copy link
Contributor Author

deads2k commented Jan 10, 2018

/retest

@deads2k
Copy link
Contributor Author

deads2k commented Jan 10, 2018

Looks like one simple unit test and this is ready

@mfojtik
Copy link
Contributor

mfojtik commented Jan 10, 2018

LGTM

good job @deads2k !

Will wait for @soltysh to tag this as this carries fixes to auditing.

@0xmichalis
Copy link
Contributor

@openshift/sig-master

soltysh
soltysh approved these changes Jan 10, 2018
View reviewed changes
Copy link
Member

@soltysh soltysh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, soltysh

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@deads2k
Copy link
Contributor Author

deads2k commented Jan 10, 2018

/retest

1 similar comment
@deads2k
Copy link
Contributor Author

deads2k commented Jan 10, 2018

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 10, 2018 •
edited

@deads2k: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_image_ecosystem 7294520 link /test extended_image_ecosystem
ci/openshift-jenkins/extended_builds 7294520 link /test extended_builds

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@deads2k
Copy link
Contributor Author

deads2k commented Jan 10, 2018

according to prow, the extended builds are failing on rebase pulls too.

Downward API is a known flake: #17882

@liggitt
Copy link
Contributor

liggitt commented Jan 10, 2018

according to prow, the extended builds are failing on rebase pulls too.

Downward API is a known flake: #17882

agree. merging to reopen the queue.

@liggitt liggitt merged commit ff839e6 into openshift:master Jan 10, 2018
This was referenced Jan 11, 2018
Closed
Closed
@deads2k deads2k deleted the rebase-to1.9.1 branch January 24, 2018 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@bparees bparees Awaiting requested review from bparees

@danwinship danwinship Awaiting requested review from danwinship

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

@DirectXMan12 DirectXMan12 Awaiting requested review from DirectXMan12

@eparis eparis Awaiting requested review from eparis

@pmorie pmorie Awaiting requested review from pmorie

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@mfojtik mfojtik

@soltysh soltysh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. needs-api-review size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@deads2k @mfojtik @0xmichalis @openshift-ci-robot @liggitt @soltysh @openshift-merge-robot