Bump Kubernetes version 1.14 #2605

jberkhahn · 2019-04-10T23:25:45Z

This bumps the versions of our kube and client-go dependencies. See comments below for specifics.

jberkhahn · 2019-04-10T23:25:51Z

/hold

jberkhahn · 2019-04-11T20:41:01Z

/test pull-service-catalog-integration

jberkhahn · 2019-04-15T21:51:18Z

charts/catalog/templates/rbac.yaml

@@ -86,7 +86,7 @@ items:
  # TODO: do not grant global access, limit to particular secrets referenced from servicebindings
  - apiGroups: [""]
    resources: ["secrets"]
-    verbs:     ["get","create","update","delete"]
+    verbs:     ["get","create","update","delete", "list", "watch"]


client-go is listing secrets when the controller starts up now, i couldn't find a way to stop it from doing this.

that's weird. probably some upstream change.

we never have fixed that comment.

jberkhahn · 2019-04-15T21:51:42Z

cmd/apiserver/app/server/util.go

@@ -192,7 +191,7 @@ func buildAdmission(c *genericapiserver.RecommendedConfig, s *ServiceCatalogServ
 	pluginNames := enabledPluginNames(s.AdmissionOptions)
 	klog.Infof("Admission control plugin names: %v", pluginNames)

-	genericInitializer := initializer.New(kubeClient, kubeSharedInformers, c.Authorization.Authorizer, api.Scheme)
+	genericInitializer := initializer.New(kubeClient, kubeSharedInformers, c.Authorization.Authorizer)


was deprecated on kube's end

that's super. it's taken a long.

jberkhahn · 2019-04-15T21:52:26Z

cmd/controller-manager/app/controller_manager.go

@@ -247,14 +248,20 @@ func Run(controllerManagerOptions *options.ControllerManagerServer) error {
 		return err
 	}

-	klog.V(5).Infof("Using namespace %v for leader election lock", controllerManagerOptions.LeaderElectionNamespace)
+	// create config for interacting with coordination.k8s.io group
+	coordinationClient, err := v1coordination.NewForConfig(k8sKubeconfig)


not really sure what this api group is for, it might just be they're trying to move things out of the default group. They had the initializer for it so I'm not too worred.

looks like leader election leases.

I don't think we have a test for that.

jberkhahn · 2019-04-15T22:21:08Z

cmd/controller-manager/app/options/options.go

@@ -120,7 +120,7 @@ func (s *ControllerManagerServer) AddFlags(fs *pflag.FlagSet) {
 	fs.DurationVar(&s.ReconciliationRetryDuration, "reconciliation-retry-duration", s.ReconciliationRetryDuration, "The maximum amount of time to retry reconciliations on a resource before failing")
 	fs.DurationVar(&s.OperationPollingMaximumBackoffDuration, "operation-polling-maximum-backoff-duration", s.OperationPollingMaximumBackoffDuration, "The maximum amount of time to back-off while polling an OSB API operation")
 	s.SecureServingOptions.AddFlags(fs)
-	utilfeature.DefaultFeatureGate.AddFlag(fs)
+	utilfeature.DefaultMutableFeatureGate.AddFlag(fs)


This is the same thing, the name just changed

are they per instance somehow now? we had parallel threading issues with featuregates in the past.

jberkhahn · 2019-04-15T22:22:20Z

pkg/apiserver/default_storage_factory_builder.go

-func mergeGroupEncodingConfigs(defaultResourceEncoding *serverstorage.DefaultResourceEncodingConfig, storageEncodingOverrides map[string]schema.GroupVersion) *serverstorage.DefaultResourceEncodingConfig {
-	resourceEncodingConfig := defaultResourceEncoding
-	for group, storageEncodingVersion := range storageEncodingOverrides {
-		resourceEncodingConfig.SetVersionEncoding(group, storageEncodingVersion, schema.GroupVersion{Group: group, Version: runtime.APIVersionInternal})


SetVersionEncoding was straight up removed. I don't see an equivalent.

that should be fine.

jberkhahn · 2019-04-15T22:22:46Z

pkg/client/clientset_generated/clientset/clientset.go

@@ -29,11 +29,7 @@ import (
 type Interface interface {
 	Discovery() discovery.DiscoveryInterface
 	ServicecatalogV1beta1() servicecatalogv1beta1.ServicecatalogV1beta1Interface
-	// Deprecated: please explicitly pick a version if possible.
-	Servicecatalog() servicecatalogv1beta1.ServicecatalogV1beta1Interface


This was finally ripped out, so I had to move everything over to using the specific version

wow, the generated code had a warning. I'd never have seen it until now.

super curious about the history of this, but not enough to spend more than 3 minutes on it.

jberkhahn · 2019-04-15T22:30:02Z

pkg/controller/controller_instance_test.go

@@ -839,8 +839,8 @@ func TestReconcileServiceInstanceAppliesDefaultProvisioningParams(t *testing.T)
 	}
 }

-func TestReconcileServiceInstanceRespectsServicePlanDefaultsFeatureGate(t *testing.T) {
-	err := utilfeature.DefaultFeatureGate.Set(fmt.Sprintf("%v=false", scfeatures.ServicePlanDefaults))
+func TestReconcileServiceInstanceRespectsServicePlanDefaultsMutableFeatureGate(t *testing.T) {


Changed the name here as well

jberkhahn · 2019-04-15T22:30:24Z

pkg/hyperkube/server.go

@@ -21,7 +21,7 @@ import (
 	"strings"

 	utiltemplate "github.com/kubernetes-incubator/service-catalog/pkg/kubernetes/pkg/util/template"
-	"k8s.io/apiserver/pkg/util/flag"
+	"k8s.io/component-base/cli/flag"


this is the same package, it just got moved into its own repo

jberkhahn · 2019-04-15T22:40:27Z

pkg/registry/servicecatalog/binding/storage.go

 	}
-	return labels.Set(binding.ObjectMeta.Labels), toSelectableFields(binding), binding.Initializers != nil, nil
+	return labels.Set(binding.ObjectMeta.Labels), toSelectableFields(binding), nil


This was also just removed

jberkhahn · 2019-04-15T22:41:07Z

plugin/pkg/admission/broker/authsarcheck/admission.go

@@ -66,7 +66,7 @@ func convertToSARExtra(extra map[string][]string) map[string]authorizationapi.Ex
 	return ret
 }

-func (s *sarcheck) Admit(a admission.Attributes) error {
+func (s *sarcheck) Admit(a admission.Attributes, o admission.ObjectInterfaces) error {


this was added to the interface, not really sure what we're supposed to do with it...

something to do for CRDs kubernetes/kubernetes#74154
feel free to browse through that.

jberkhahn · 2019-04-15T22:41:34Z

plugin/pkg/admission/broker/authsarcheck/admission_test.go

@@ -240,7 +240,7 @@ func TestAdmissionBroker(t *testing.T) {
 		}
 		kubeInformerFactory.Start(wait.NeverStop)

-		err = handler.(admission.MutationInterface).Admit(admission.NewAttributesRecord(tc.broker, nil, servicecatalog.Kind("ClusterServiceBroker").WithVersion("version"), tc.broker.Namespace, tc.broker.Name, servicecatalog.Resource("clusterservicebrokers").WithVersion("version"), "", admission.Create, false, tc.userInfo))
+		err = handler.(admission.MutationInterface).Admit(admission.NewAttributesRecord(tc.broker, nil, servicecatalog.Kind("ClusterServiceBroker").WithVersion("version"), tc.broker.Namespace, tc.broker.Name, servicecatalog.Resource("clusterservicebrokers").WithVersion("version"), "", admission.Create, false, tc.userInfo), nil)


left it as nil unless and until we figure out what to do with it

should be fine.

jberkhahn · 2019-04-15T22:45:29Z

test/integration/clientset_test.go

@@ -110,7 +110,7 @@ func TestEtcdHealthCheckerSuccess(t *testing.T) {
 }

 func testGroupVersion(client servicecatalogclient.Interface) error {
-	gv := client.Servicecatalog().RESTClient().APIVersion()
+	gv := client.ServicecatalogV1beta1().RESTClient().APIVersion()


non-versioned way was deprecated

wow, totally gone?

jberkhahn · 2019-04-15T22:45:59Z

test/integration/framework.go

@@ -76,7 +76,7 @@ func withConfigGetFreshApiserverAndClient(

 	var etcdOptions *server.EtcdOptions
 	etcdOptions = server.NewEtcdOptions()
-	etcdOptions.StorageConfig.ServerList = serverConfig.etcdServerList
+	etcdOptions.StorageConfig.Transport.ServerList = serverConfig.etcdServerList


Same thing, it just got moved into a sub-struct on the StorageConfig

I find that a bizarre name. it's not a transport or anything like a transport.

que sera

jberkhahn · 2019-04-15T22:46:21Z

@MHBauer @jboyd01 this is ready for review

MHBauer · 2019-04-15T23:14:40Z

/lgtm

MHBauer · 2019-04-16T17:13:53Z

why is this hold?

jberkhahn · 2019-04-16T21:37:05Z

@piotrmiskiewicz took a look at this and gave it the thumbs up. it will require some changes to their CRD branch, but they're cool with that

jboyd01 · 2019-04-17T16:18:01Z

/approve

k8s-ci-robot · 2019-04-17T16:18:17Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jboyd01

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [jboyd01]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 10, 2019

k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 10, 2019

k8s-ci-robot requested review from jpeeler and staebler April 10, 2019 23:26

jberkhahn force-pushed the bump_kube_1.14 branch 3 times, most recently from de8c487 to ad0222c Compare April 11, 2019 00:02

jberkhahn force-pushed the bump_kube_1.14 branch from ad0222c to c4a4f92 Compare April 12, 2019 18:40

WIP

7847a4a

jberkhahn force-pushed the bump_kube_1.14 branch from c4a4f92 to 7847a4a Compare April 15, 2019 18:45

jberkhahn commented Apr 15, 2019

View reviewed changes

k8s-ci-robot assigned MHBauer Apr 15, 2019

k8s-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 15, 2019

jberkhahn removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 16, 2019

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 17, 2019

k8s-ci-robot merged commit 7fe8aaf into kubernetes-retired:master Apr 17, 2019

viviyww pushed a commit to viviyww/service-catalog that referenced this pull request May 10, 2019

WIP (kubernetes-retired#2605)

b500fb2

cblecker unassigned MHBauer Jun 4, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump Kubernetes version 1.14 #2605

Bump Kubernetes version 1.14 #2605

jberkhahn commented Apr 10, 2019 •

edited

Loading

jberkhahn commented Apr 10, 2019

jberkhahn commented Apr 11, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

jberkhahn Apr 15, 2019

jberkhahn Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn Apr 15, 2019

MHBauer Apr 15, 2019

jberkhahn commented Apr 15, 2019

MHBauer commented Apr 15, 2019

MHBauer commented Apr 16, 2019

jberkhahn commented Apr 16, 2019

jboyd01 commented Apr 17, 2019

k8s-ci-robot commented Apr 17, 2019

Bump Kubernetes version 1.14 #2605

Bump Kubernetes version 1.14 #2605

Conversation

jberkhahn commented Apr 10, 2019 • edited Loading

jberkhahn commented Apr 10, 2019

jberkhahn commented Apr 11, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jberkhahn commented Apr 15, 2019

MHBauer commented Apr 15, 2019

MHBauer commented Apr 16, 2019

jberkhahn commented Apr 16, 2019

jboyd01 commented Apr 17, 2019

k8s-ci-robot commented Apr 17, 2019

jberkhahn commented Apr 10, 2019 •

edited

Loading