Skip to content

Commit ff9739b

Browse files
authored
Update dependencies to kubernetes-1.9.1 (openshift#1633)
* Update dependencies to kubernetes-1.9.1 * Using the latest stable etcd release 3.2.13 * Fix build: - switch to runtime.Object.DeepCopy() - follow-up on admission plugins refactoring - etcd/apiserver config changes
1 parent 9c36019 commit ff9739b

File tree

3,107 files changed

+141836
-36856
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,107 files changed

+141836
-36856
lines changed

Diff for: cmd/apiserver/app/server/etcd_options.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package server
1818

1919
import (
20-
"github.com/kubernetes-incubator/service-catalog/pkg/api"
2120
"github.com/spf13/pflag"
2221
genericserveroptions "k8s.io/apiserver/pkg/server/options"
2322
"k8s.io/apiserver/pkg/storage/storagebackend"
@@ -42,7 +41,7 @@ const (
4241
// NewEtcdOptions creates a new, empty, EtcdOptions instance
4342
func NewEtcdOptions() *EtcdOptions {
4443
return &EtcdOptions{
45-
EtcdOptions: genericserveroptions.NewEtcdOptions(storagebackend.NewDefaultConfig(DefaultEtcdPathPrefix, api.Scheme, nil)),
44+
EtcdOptions: genericserveroptions.NewEtcdOptions(storagebackend.NewDefaultConfig(DefaultEtcdPathPrefix, nil)),
4645
}
4746
}
4847

Diff for: cmd/apiserver/app/server/util.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727

2828
"k8s.io/apimachinery/pkg/runtime/schema"
2929
"k8s.io/apiserver/pkg/admission"
30+
admissionmetrics "k8s.io/apiserver/pkg/admission/metrics"
3031
"k8s.io/apiserver/pkg/authorization/authorizerfactory"
3132
genericapiserver "k8s.io/apiserver/pkg/server"
3233
kubeinformers "k8s.io/client-go/informers"
@@ -169,11 +170,11 @@ func buildAdmission(s *ServiceCatalogServerOptions,
169170
var err error
170171

171172
pluginInitializer := scadmission.NewPluginInitializer(client, sharedInformers, kubeClient, kubeSharedInformers)
172-
admissionConfigProvider, err := admission.ReadAdmissionConfiguration(admissionControlPluginNames, s.AdmissionOptions.ConfigFile)
173+
admissionConfigProvider, err := admission.ReadAdmissionConfiguration(admissionControlPluginNames, s.AdmissionOptions.ConfigFile, api.Scheme)
173174
if err != nil {
174175
return nil, fmt.Errorf("failed to read plugin config: %v", err)
175176
}
176-
return s.AdmissionOptions.Plugins.NewFromPlugins(admissionControlPluginNames, admissionConfigProvider, pluginInitializer)
177+
return s.AdmissionOptions.Plugins.NewFromPlugins(admissionControlPluginNames, admissionConfigProvider, pluginInitializer, admissionmetrics.WithControllerMetrics)
177178
}
178179

179180
// addPostStartHooks adds the common post start hooks we invoke when using either server storage option.

0 commit comments

Comments
 (0)