Created
June 27, 2018 12:57
-
-
Save soltysh/9bbbca18c9d830b082cd8cf464d20bee to your computer and use it in GitHub Desktop.
This file contains 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
diff --git a/pkg/build/admission/jenkinsbootstrapper/admission.go b/pkg/build/admission/jenkinsbootstrapper/admission.go | |
index c30fd3cde9..bf86ffb17d 100644 | |
--- a/pkg/build/admission/jenkinsbootstrapper/admission.go | |
+++ b/pkg/build/admission/jenkinsbootstrapper/admission.go | |
@@ -17,8 +17,8 @@ import ( | |
coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" | |
kadmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" | |
- buildapi "github.com/openshift/origin/pkg/build/apis/build" | |
jenkinscontroller "github.com/openshift/origin/pkg/build/admission/jenkinsbootstrapper/jenkins" | |
+ buildapi "github.com/openshift/origin/pkg/build/apis/build" | |
authenticationclient "github.com/openshift/origin/pkg/client/impersonatingclient" | |
oadmission "github.com/openshift/origin/pkg/cmd/server/admission" | |
configapi "github.com/openshift/origin/pkg/cmd/server/apis/config" | |
diff --git a/pkg/cmd/openshift-controller-manager/controller_manager.go b/pkg/cmd/openshift-controller-manager/controller_manager.go | |
index 04b4c804b1..0b841aed48 100644 | |
--- a/pkg/cmd/openshift-controller-manager/controller_manager.go | |
+++ b/pkg/cmd/openshift-controller-manager/controller_manager.go | |
@@ -147,9 +147,9 @@ func newControllerContext( | |
RouteInformers: informers.GetRouteInformers(), | |
TemplateInformers: informers.GetTemplateInformers(), | |
GenericResourceInformer: informers.ToGenericInformer(), | |
- Stop: stopCh, | |
- InformersStarted: informersStarted, | |
- RestMapper: dynamicRestMapper, | |
+ Stop: stopCh, | |
+ InformersStarted: informersStarted, | |
+ RestMapper: dynamicRestMapper, | |
} | |
return openshiftControllerContext | |
diff --git a/pkg/oauthserver/osinserver/osinserver_test.go b/pkg/oauthserver/osinserver/osinserver_test.go | |
index 9fa0670a2d..16c8885a24 100644 | |
--- a/pkg/oauthserver/osinserver/osinserver_test.go | |
+++ b/pkg/oauthserver/osinserver/osinserver_test.go | |
@@ -127,9 +127,9 @@ func TestAuthorizeStartFlow(t *testing.T) { | |
} | |
url := config.AuthCodeURL("") | |
client := http.Client{ /*CheckRedirect: func(req *http.Request, via []*http.Request) error { | |
- t.Logf("redirect (%d): to %s, %#v", len(via), req.URL, req) | |
- return nil | |
- }*/} | |
+ t.Logf("redirect (%d): to %s, %#v", len(via), req.URL, req) | |
+ return nil | |
+ }*/} | |
if _, err := client.Get(url); err != nil { | |
t.Fatalf("unexpected error: %v", err) | |
} | |
diff --git a/pkg/security/securitycontextconstraints/provider_test.go b/pkg/security/securitycontextconstraints/provider_test.go | |
index d02bbbb666..5fba568e2e 100644 | |
--- a/pkg/security/securitycontextconstraints/provider_test.go | |
+++ b/pkg/security/securitycontextconstraints/provider_test.go | |
@@ -836,7 +836,7 @@ func defaultPod() *api.Pod { | |
ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{}}, | |
Spec: api.PodSpec{ | |
SecurityContext: &api.PodSecurityContext{ | |
- // fill in for test cases | |
+ // fill in for test cases | |
}, | |
Containers: []api.Container{ | |
{ | |
diff --git a/test/integration/oauth_cert_fallback_test.go b/test/integration/oauth_cert_fallback_test.go | |
index dc39bfa275..604e236b74 100644 | |
--- a/test/integration/oauth_cert_fallback_test.go | |
+++ b/test/integration/oauth_cert_fallback_test.go | |
@@ -25,9 +25,9 @@ func TestOAuthCertFallback(t *testing.T) { | |
noToken = "" | |
invalidCert = restclient.TLSClientConfig{ | |
- // We have to generate this dynamically in order to have an invalid cert signed by a signer with the same name as the valid CA | |
- // CertData: ..., | |
- // KeyData: ..., | |
+ // We have to generate this dynamically in order to have an invalid cert signed by a signer with the same name as the valid CA | |
+ // CertData: ..., | |
+ // KeyData: ..., | |
} | |
noCert = restclient.TLSClientConfig{} | |
diff --git a/test/integration/oauthstorage_test.go b/test/integration/oauthstorage_test.go | |
index 3e4ee54a8a..a30d080151 100644 | |
--- a/test/integration/oauthstorage_test.go | |
+++ b/test/integration/oauthstorage_test.go | |
@@ -152,9 +152,9 @@ func TestOAuthStorage(t *testing.T) { | |
} | |
url := config.AuthCodeURL("") | |
client := http.Client{ /*CheckRedirect: func(req *http.Request, via []*http.Request) error { | |
- t.Logf("redirect (%d): to %s, %#v", len(via), req.URL, req) | |
- return nil | |
- }*/} | |
+ t.Logf("redirect (%d): to %s, %#v", len(via), req.URL, req) | |
+ return nil | |
+ }*/} | |
resp, err := client.Get(url) | |
if err != nil { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment