Automated cherry pick of #62649: Ensure service routing resolves kubernetes.default.svc#62654
Merged
k8s-github-robot merged 6 commits intokubernetes:release-1.10from Apr 24, 2018
Conversation
Contributor
|
/lgtm |
7feff47 to
a60d053
Compare
Contributor
|
The discussion seems to be still ongoing on the base PR. I'll wait with approving cherry-pick until base PR is finalized and merged. |
Contributor
|
/lgtm |
a6d1892 to
11b3b98
Compare
Member
Author
|
fixed up server wiring in the integration test to match 1.10-era startup: --- a/test/integration/examples/setup_test.go
+++ b/test/integration/examples/setup_test.go
@@ -97,21 +97,17 @@ func startTestServer(t *testing.T, stopCh <-chan struct{}, setup TestServerSetup
kubeAPIServerOptions.Authentication.RequestHeader.AllowedNames = []string{"kube-aggregator"}
kubeAPIServerOptions.Authentication.RequestHeader.ClientCAFile = proxyCACertFile.Name()
kubeAPIServerOptions.Authentication.ClientCert.ClientCA = clientCACertFile.Name()
- kubeAPIServerOptions.Authorization.Modes = []string{"Node", "RBAC"}
+ kubeAPIServerOptions.Authorization.Mode = "Node,RBAC"
if setup.ModifyServerRunOptions != nil {
setup.ModifyServerRunOptions(kubeAPIServerOptions)
}
- completedOptions, err := app.Complete(kubeAPIServerOptions)
+ tunneler, proxyTransport, err := app.CreateNodeDialer(kubeAPIServerOptions)
if err != nil {
t.Fatal(err)
}
- tunneler, proxyTransport, err := app.CreateNodeDialer(completedOptions)
- if err != nil {
- t.Fatal(err)
- }
- kubeAPIServerConfig, sharedInformers, versionedInformers, _, _, _, err := app.CreateKubeAPIServerConfig(completedOptions, tunneler, proxyTransport)
+ kubeAPIServerConfig, sharedInformers, versionedInformers, _, _, _, err := app.CreateKubeAPIServerConfig(kubeAPIServerOptions, tunneler, proxyTransport)
if err != nil {
t.Fatal(err)
}
@@ -119,7 +115,7 @@ func startTestServer(t *testing.T, stopCh <-chan struct{}, setup TestServerSetup
if setup.ModifyServerConfig != nil {
setup.ModifyServerConfig(kubeAPIServerConfig)
}
- kubeAPIServer, err := app.CreateKubeAPIServer(kubeAPIServerConfig, genericapiserver.NewEmptyDelegate(), sharedInformers, versionedInformers)
+ kubeAPIServer, err := app.CreateKubeAPIServer(kubeAPIServerConfig, genericapiserver.EmptyDelegate, sharedInformers, versionedInformers)
if err != nil {
t.Fatal(err)
} |
Contributor
|
diff lgtm /lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k, liggitt The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test all [submit-queue is verifying that this PR is safe to merge] |
|
Automatic merge from submit-queue. |
k8s-github-robot
pushed a commit
that referenced
this pull request
May 15, 2018
…4-upstream-release-1.9 Automatic merge from submit-queue. Automated cherry pick of #62654: Ensure service routing resolves kubernetes.default.svc Cherry pick of #62654 on release-1.9. #62654: Ensure service routing resolves kubernetes.default.svc ```release-note Fixes the kubernetes.default.svc loopback service resolution to use a loopback configuration. ```
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry pick of #62649 on release-1.10.
#62649: Ensure service routing resolves kubernetes.default.svc