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

Wait longer for healthz during integration tests #16040

Merged
merged 2 commits into from
Sep 1, 2017
Merged

Wait longer for healthz during integration tests #16040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35c1027
Wait longer for healthz during integration tests
enj Aug 29, 2017
2b121fc
Fix go vet errors
enj Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/cmd/server/kubernetes/node/node_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable
},
Webhook: componentconfig.KubeletWebhookAuthentication{
Enabled: true,
CacheTTL: metav1.Duration{authnTTL},
CacheTTL: metav1.Duration{Duration: authnTTL},
},
Anonymous: componentconfig.KubeletAnonymousAuthentication{
Enabled: true,
Expand All @@ -214,8 +214,8 @@ func BuildKubernetesNodeConfig(options configapi.NodeConfig, enableProxy, enable
server.Authorization = componentconfig.KubeletAuthorization{
Mode: componentconfig.KubeletAuthorizationModeWebhook,
Webhook: componentconfig.KubeletWebhookAuthorization{
CacheAuthorizedTTL: metav1.Duration{authzTTL},
CacheUnauthorizedTTL: metav1.Duration{authzTTL},
CacheAuthorizedTTL: metav1.Duration{Duration: authzTTL},
CacheUnauthorizedTTL: metav1.Duration{Duration: authzTTL},
},
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/server/origin/openshift_apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ func (c *OpenshiftAPIConfig) ensureOpenShiftInfraNamespace(context genericapiser
// Ensure we have the bootstrap SA for Nodes
_, err = c.KubeClientInternal.Core().ServiceAccounts(ns).Create(&kapi.ServiceAccount{ObjectMeta: metav1.ObjectMeta{Name: bootstrappolicy.InfraNodeBootstrapServiceAccountName}})
if err != nil && !kapierror.IsAlreadyExists(err) {
glog.Errorf("Error creating service account %s/%s: %v", namespace, bootstrappolicy.InfraNodeBootstrapServiceAccountName, err)
glog.Errorf("Error creating service account %s/%s: %v", ns, bootstrappolicy.InfraNodeBootstrapServiceAccountName, err)
}

EnsureNamespaceServiceAccountRoleBindings(c.KubeClientInternal, c.DeprecatedOpenshiftClient, namespace)
Expand Down
4 changes: 2 additions & 2 deletions pkg/router/controller/factory/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (factory *RouterControllerFactory) Create(plugin router.Plugin, watchNodes,
field: factory.Fields,
label: factory.Labels,
}
cache.NewReflector(&cache.ListWatch{rLW.List, rLW.Watch}, &routeapi.Route{}, routeEventQueue, factory.ResyncInterval).Run()
cache.NewReflector(&cache.ListWatch{ListFunc: rLW.List, WatchFunc: rLW.Watch}, &routeapi.Route{}, routeEventQueue, factory.ResyncInterval).Run()

endpointsEventQueue := oscache.NewEventQueue(routerKeyFn)
cache.NewReflector(&endpointsLW{
Expand Down Expand Up @@ -223,7 +223,7 @@ func (factory *RouterControllerFactory) CreateNotifier(changed func()) RoutesByH
field: factory.Fields,
label: factory.Labels,
}
cache.NewReflector(&cache.ListWatch{rLW.List, rLW.Watch}, &routeapi.Route{}, routeEventQueue, factory.ResyncInterval).Run()
cache.NewReflector(&cache.ListWatch{ListFunc: rLW.List, WatchFunc: rLW.Watch}, &routeapi.Route{}, routeEventQueue, factory.ResyncInterval).Run()

endpointStore := cache.NewStore(keyFn)
endpointsEventQueue := oscache.NewEventQueueForStore(keyFn, endpointStore)
Expand Down
2 changes: 1 addition & 1 deletion test/util/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ func StartConfiguredMasterWithOptions(masterConfig *configapi.MasterConfig, test
}

var healthzResponse string
err = wait.Poll(100*time.Millisecond, 10*time.Second, func() (bool, error) {
err = wait.Poll(time.Second, time.Minute, func() (bool, error) {
var healthy bool
healthy, healthzResponse, err = IsServerHealthy(*masterURL)
if err != nil {
Expand Down