Rebase kubernetes 1.7.6 #42

ironcladlou · 2017-09-22T18:39:52Z

Rebase for kubernetes 1.7.6.

:100644 100644 a9b6b37... 2328ffc... M pkg/apiserver/api_installer.go

:100644 100644 c561ddb... 17ef5df... M pkg/kubelet/server.go

…vider Previously, if the kubelet tried to register itself with the API server, and was rejected due to the external ID changing, it would delete the node object and recreate it. This commit causes it to tolerate a change in ExternalID when the ExternalID is not being provided by a cloud provider, assuming the new ExternalID is either the node's (metadata) name, or one of node's addresses. :100644 100644 0c4fdc1... 8deaa82... M pkg/kubelet/kubelet.go

:100644 100644 ac7025a... dce57e1... M pkg/apimachinery/registered/registered.go

:100644 100644 b32534e... 3e694fc... M pkg/controller/serviceaccount/tokens_controller.go

:100644 100644 eaa35e6... 2a50982... M pkg/client/cache/fifo.go :100644 100644 0f2ceb8... 667c168... M pkg/client/cache/fifo_test.go

Doesn't offer enough use, complicates creation and setup.

We don't run system pods so waiting for them is somewhat pointless

ironcladlou · 2017-09-22T18:42:32Z

Build is currently broken in at least one major way:

da36aea is missing 2e6be85 from Move generators to staging/src/k8s.io/kube-gen kubernetes/kubernetes#49114; all the code generation support was moved, but the corresponding build tooling commit was never pulled in. 2e6be85 no longer cleanly applies to this branch.

soltysh · 2017-09-25T09:50:35Z

origin.sha

@@ -0,0 +1 @@
+9009938f67


This is not needed, we need to create this at the end.

still outstanding

soltysh · 2017-09-25T09:59:51Z

origin.sha

@@ -1 +1 @@
-9009938f67
+87ceff292ab199dc902b52f942951f1b7b88e4fa


Not needed either.

soltysh · 2017-09-29T16:46:39Z

This needs ironcladlou#25 to merge in and then it'll be ready for merge to fork.

liggitt · 2017-10-02T14:02:00Z

pkg/api/v1/zz_generated.deepcopy.go

@@ -1,20 +1,4 @@
-// +build !ignore_autogenerated


should drop this commit and regenerate at the end

liggitt · 2017-10-02T14:04:47Z

plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go

@@ -71,7 +71,7 @@ func init() {
 	addControllerRole(rbac.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{Name: saRolePrefix + "cronjob-controller"},
 		Rules: []rbac.PolicyRule{
-			rbac.NewRule("get", "list", "watch", "update").Groups(batchGroup).Resources("cronjobs").RuleOrDie(),
+			rbac.NewRule("get", "list", "watch", "update", "delete").Groups(batchGroup).Resources("cronjobs").RuleOrDie(),


this commit needs repicking... this isn't the permission we ended up granting upstream

There are 2 modifying this:

b384813 - UPSTREAM: 49133: add controller permissions to set blockOwnerDeletion (6 days ago)

6b69907 - UPSTREAM: 49133: update permissions to allow block owner deletion (7 days ago)

We could squash them into one.

liggitt · 2017-10-02T14:07:33Z

cmd/kube-controller-manager/app/plugins.go

@@ -50,7 +50,6 @@ import (
 	"k8s.io/kubernetes/pkg/volume/local"


these two should cancel and be able to be dropped:

UPSTREAM: <drop>: hack out portworx to avoid double proto registration UPSTREAM: revert: dcb5eef2d8a6d14816d8d1f767f0d0016b84dcdf: "UPSTREAM: <drop>: hack out portworx to avoid double proto registration"

liggitt · 2017-10-02T14:08:42Z

test/e2e/examples.go

@@ -72,7 +72,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {

 		// this test wants powerful permissions.  Since the namespace names are unique, we can leave this
 		// lying around so we don't have to race any caches
-		framework.BindClusterRoleInNamespace(c.Rbac(), "edit", f.Namespace.Name,
+		framework.BindClusterRoleInNamespace(c.RbacV1beta1(), f.ClientPool, "edit", f.Namespace.Name,


these two should cancel and be able to both be dropped:

UPSTREAM: revert: c502d10: <carry>: match kube rbac setup in e2es with openshift kinds UPSTREAM: <carry>: match kube rbac setup in e2es with openshift kinds

liggitt · 2017-10-02T14:09:17Z

pkg/api/pod/util_patch.go

@@ -0,0 +1,26 @@
+package pod


these two should cancel and both be able to be dropped:

UPSTREAM: Revert "UPSTREAM: <drop>: keep old pod available" UPSTREAM: <drop>: keep old pod available

liggitt · 2017-10-02T14:11:35Z

pkg/kubectl/cmd/util/factory_test.go

@@ -746,14 +746,12 @@ func TestDiscoveryReplaceAliases(t *testing.T) {
 		{
 			name:     "all-replacement",
 			arg:      "all",
-			expected: "buildconfigs,builds,imagestreams,deploymentconfigs,pods,replicationcontrollers,services,statefulsets.apps,horizontalpodautoscalers.autoscaling,jobs.batch,deployments.extensions,replicasets.extensions",
-			// expected: "buildconfigs,builds,imagestreams,deploymentconfigs,deployments,horizontalpodautoscalers,replicationcontrollers,routes,services,statefulsets,jobs,replicasets,pods",
+			expected: "pods,replicationcontrollers,services,statefulsets.apps,horizontalpodautoscalers.autoscaling,jobs.batch,deployments.extensions,replicasets.extensions",


squash these commits:

UPSTREAM: <drop>: restore normal alias test UPSTREAM: <drop>: add origin resource shortcuts to kube shortcut restmapper

liggitt · 2017-10-02T15:03:38Z

staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go

@@ -138,10 +138,10 @@ func TestProxyHandler(t *testing.T) {
 			apiService: &apiregistration.APIService{
 				ObjectMeta: metav1.ObjectMeta{Name: "v1.foo"},
 				Spec: apiregistration.APIServiceSpec{
-					Service:               &apiregistration.ServiceReference{},


drop this commit completely, this got merged upstream and the secure test is below

liggitt · 2017-10-02T15:06:48Z

pkg/api/types.go

@@ -1580,6 +1580,9 @@ const (
 // Capability represent POSIX capabilities type
 type Capability string

+// CapabilityAll represent all POSIX capabilities types.


drop these (they cancel):

UPSTREAM: <carry>: allow to use * as a capability in Security Context UPSTREAM: revert: 1b2aacbd4010757b6978ddc40bfc8d89495c89dd: <carry>: allow to use * as a capability in Security Context Constraints.

liggitt · 2017-10-02T15:10:07Z

staging/src/k8s.io/apiserver/pkg/server/drop_patch.go

@@ -0,0 +1,28 @@
+/*


drop both of these (they cancel):

UPSTREAM: <drop>: drop post 3.7 rebase. allows disabled aggregator UPSTREAM: revert: 7fc9d38a7a: <drop>: drop post 3.7 rebase. allows disabled aggregator

liggitt · 2017-10-02T15:11:10Z

staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go

@@ -251,18 +251,20 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
 		return nil


drop both of these, they cancel:

UPSTREAM: revert: fbf1f04: <drop>: disable openapi aggregation UPSTREAM: <drop>: disable openapi aggregation

:100644 100644 2b0ff8c2c7... 3d05185057... M pkg/cloudprovider/providers/aws/tags.go

…h verbosity. :100644 100644 b123c5a7a2... 7e25e48435... M plugin/pkg/scheduler/algorithm/predicates/BUILD :100644 100644 95939bf504... 06deb30149... M plugin/pkg/scheduler/algorithm/predicates/predicates.go

:100644 100644 74a5174968... aa6f711c95... M cmd/cloud-controller-manager/app/options/options.go :100644 100644 28f906e528... 49f793294b... M cmd/cloud-controller-manager/controller-manager.go :100644 100644 4e77a7f0ef... 7d071dacaa... M cmd/kube-controller-manager/app/controllermanager.go :100644 100644 dec8d1f1ad... be69e12898... M cmd/kube-controller-manager/app/options/options.go :100644 100644 4c99e4a42c... a42543aa1b... M pkg/apis/componentconfig/types.go :100644 100644 2fb837b719... 0074fe3d02... M pkg/cloudprovider/cloud.go :100644 100644 a55061a74c... 5ab1b9e75e... M pkg/cloudprovider/providers/aws/aws.go :100644 100644 3d05185057... bb63fce2bf... M pkg/cloudprovider/providers/aws/tags.go :100644 100644 ca2e48b7e6... 1b4e645dd9... M pkg/cloudprovider/providers/azure/azure.go :100644 100644 f8e2b3ffb6... 1b86d8243a... M pkg/cloudprovider/providers/cloudstack/cloudstack.go :100644 100644 dcca77f511... a92c2d9b80... M pkg/cloudprovider/providers/fake/fake.go :100644 100644 90e2570a42... 0086678bca... M pkg/cloudprovider/providers/gce/gce.go :100644 100644 9462ff0a05... 3670813950... M pkg/cloudprovider/providers/mesos/mesos.go :100644 100644 08a35565e6... 5073cf4ef8... M pkg/cloudprovider/providers/openstack/openstack.go :100644 100644 8273c0b170... 496c444388... M pkg/cloudprovider/providers/ovirt/ovirt.go :100644 100644 f33e9c27a8... dd7b065d5a... M pkg/cloudprovider/providers/photon/photon.go :100644 100644 cf6ca3d445... 21782f4839... M pkg/cloudprovider/providers/rackspace/rackspace.go :100644 100644 63383a0657... 35d60888d2... M pkg/cloudprovider/providers/vsphere/vsphere.go

UPSTREAM: 49117: Add apiserver metric for response sizes split by namespace scope UPSTREAM: 49678: Report non-resource URLs in max-in-flight correctly UPSTREAM: 49678: Timeout filter returns 504 and an inconsistent error body UPSTREAM: 50123: Report pod logs as CONNECT in metrics UPSTREAM: 52237: Add scope to all apiserver metrics and report resource scope :100644 100644 a7877975cf... cb637257a4... M pkg/registry/core/pod/rest/log.go :100644 100644 d856440a83... 435a746b44... M staging/src/k8s.io/apiserver/pkg/endpoints/handlers/proxy.go :100644 100644 7a412a3e27... 9651c6f65a... M staging/src/k8s.io/apiserver/pkg/endpoints/installer.go :100644 100644 2b5a3e0fd4... 067131411d... M staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go :100644 100644 989517c917... 07696d3d3e... M staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go :100644 100644 77aa7d0076... 612678c328... M staging/src/k8s.io/apiserver/pkg/server/filters/BUILD :100644 100644 b5192bc590... a0208ed034... M staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go :100644 100644 79e185e818... fc302b22b4... M staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight_test.go :100644 100644 19894b470b... 6bc496bdbf... M staging/src/k8s.io/apiserver/pkg/server/filters/timeout.go :100644 100644 991427231a... 6283a6cc21... M staging/src/k8s.io/apiserver/pkg/server/filters/timeout_test.go

:100644 100644 7a97202f78... 37f6ee05ae... M pkg/controller/volume/attachdetach/attach_detach_controller.go :100644 100644 552530170f... 3aaf715525... M pkg/controller/volume/attachdetach/cache/actual_state_of_world.go :100644 100644 88ae500d82... 81e5653fd0... M pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go :100644 100644 ec011918ab... 12da11be39... M pkg/controller/volume/attachdetach/reconciler/reconciler_test.go

…:nodes group :100644 100644 1697ad680d... 4c9cd35296... M plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy.go :100644 100644 5b666247fc... 87e8d85066... M plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml

:100644 100644 d7da1ba0ce... 9eec35352a... M pkg/apis/componentconfig/helpers.go :100644 100644 b001433753... 613d41c3c1... M pkg/util/taints/taints.go

:100644 100644 31228219fe... 72987e330d... M pkg/controller/node/timed_workers_test.go

:100644 100644 b6045ab6f1... 223ef46bed... M cmd/kubelet/app/server.go :100644 100644 49f641ab36... 9f4753b222... M pkg/kubelet/cadvisor/BUILD :100644 100644 8f8b3e8f87... a8020a503c... M pkg/kubelet/cadvisor/cadvisor_linux.go :100644 100644 d28d71ffa0... 7dbbde83ff... M pkg/kubelet/cadvisor/cadvisor_unsupported.go :100644 100644 4de44d7fba... 0033f92314... M pkg/kubelet/cadvisor/cadvisor_windows.go :100644 100644 2a97ba3523... 9ad6267ec2... M pkg/kubelet/cadvisor/types.go :100644 100644 bd30c66530... 42248f6695... M pkg/kubelet/cadvisor/util.go :100644 100644 ce50a109f0... 32f3f6a9e3... M test/e2e_node/environment/conformance.go

:100644 100644 9f4753b222... c5de9dad14... M pkg/kubelet/cadvisor/BUILD :100644 100644 7dbbde83ff... be42d39e36... M pkg/kubelet/cadvisor/cadvisor_unsupported.go :100644 100644 0033f92314... 404dd05c75... M pkg/kubelet/cadvisor/cadvisor_windows.go :000000 100644 0000000000... a9e88b5bf8... A pkg/kubelet/cadvisor/helpers_linux.go :000000 100644 0000000000... af90f150c1... A pkg/kubelet/cadvisor/helpers_unsupported.go :100644 100644 42248f6695... bd30c66530... M pkg/kubelet/cadvisor/util.go

:100644 100644 a9e88b5bf8... 94af5d39de... M pkg/kubelet/cadvisor/helpers_linux.go

:100644 100644 b85f6c8c23... d1dfa73a6c... M staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit_test.go :100644 100644 b5f310af04... 528b7094c7... M staging/src/k8s.io/apiserver/pkg/server/options/audit.go :100644 100644 82005d6ab3... 897aa13666... M staging/src/k8s.io/apiserver/plugin/pkg/audit/log/BUILD :100644 100644 9f381806d5... dec402e504... M staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go

:100644 100644 526710c2c6... 78082d216b... M staging/src/k8s.io/apiserver/pkg/audit/policy/checker.go :100644 100644 3c52d52c28... c5340c85d9... M staging/src/k8s.io/apiserver/pkg/endpoints/filters/BUILD :100644 100644 9ff9c45b9d... 2de7bc1733... M staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go :000000 100644 0000000000... a3c192f79f... A staging/src/k8s.io/apiserver/pkg/endpoints/filters/authn_audit.go :000000 100644 0000000000... fb9eeebf6b... A staging/src/k8s.io/apiserver/pkg/endpoints/filters/authn_audit_test.go :100644 100644 87a82518a6... 78fa466c34... M staging/src/k8s.io/apiserver/pkg/server/config.go

:100644 100644 2de7bc1733... c65c6119c7... M staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go

:100644 100644 2fcce4da75... 195340ecbd... M staging/src/k8s.io/apiserver/pkg/audit/policy/reader.go :100644 100644 be76364f59... 3eabbd3cb3... M staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go

ironcladlou · 2017-10-03T13:12:29Z

Addressed all comments (I think), and added a new commit at the end with new code generation results. PTAL.

liggitt · 2017-10-03T13:44:05Z

~~where did UPSTREAM: <carry>: allow PV controller recycler template override (3dc98da) go?~~

edit: we don't need it, and I asked you to drop it. carry on.

liggitt · 2017-10-03T13:49:50Z

LGTM

liggitt · 2017-10-03T13:51:27Z

are tests passing on this branch? if so, let's pull this into the origin branch, and get LGTM/green there before merging this

soltysh · 2017-10-03T13:53:33Z

@liggitt double checking, if yes I'll merge it in.

soltysh · 2017-10-03T14:25:23Z

1.7.x rebase

soltysh · 2017-10-04T13:55:51Z

Double checked it works fine. The only problem I've struggled was related to failures in integration tests which were cause by the low open files limit. After I bumped it to 102400 the integration suite passed.
@smarterclayton @mfojtik @ironcladlou @deads2k @sttts fyi, in case you hit this

Merging.

sttts · 2017-10-04T14:02:37Z

🚀

Paul Weil and others added 12 commits September 22, 2017 10:19

UPSTREAM: <carry>: reallow the ability to post across namespaces in api

0c43cd9

:100644 100644 a9b6b37... 2328ffc... M pkg/apiserver/api_installer.go

UPSTREAM: <carry>: add kubelet timeouts

dec1812

:100644 100644 c561ddb... 17ef5df... M pkg/kubelet/server.go

UPSTREAM: <carry>: Add our types to kubectl get error

30ecb24

UPSTREAM: <carry>: Allow overriding default generators for run

dfd18ea

UPSTREAM: <carry>: force import ordering for stable codegen

5a33e34

UPSTREAM: <drop>: merge multiple registrations for the same group

b60ea94

:100644 100644 ac7025a... dce57e1... M pkg/apimachinery/registered/registered.go

UPSTREAM: <carry>: add service serving cert signer to token controller

b892bc9

:100644 100644 b32534e... 3e694fc... M pkg/controller/serviceaccount/tokens_controller.go

UPSTREAM: <carry>: fix fifo resync, remove after FIFO is dead

0be53fc

:100644 100644 eaa35e6... 2a50982... M pkg/client/cache/fifo.go :100644 100644 0f2ceb8... 667c168... M pkg/client/cache/fifo_test.go

UPSTREAM: <carry>: ignored namespace lifecycle resources

0eff8f3

UPSTREAM: <carry>: Disable file locking in clientcmd

f7566e7

Doesn't offer enough use, complicates creation and setup.

UPSTREAM: <carry>: Disable e2e pre-check on scheduler predicates

6d1e050

We don't run system pods so waiting for them is somewhat pointless

soltysh reviewed Sep 25, 2017

View reviewed changes

origin.sha Outdated

@@ -1 +1 @@

9009938f67

87ceff292ab199dc902b52f942951f1b7b88e4fa

Copy link

soltysh Sep 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed either.

ironcladlou force-pushed the rebase-1.7.6 branch 3 times, most recently from 3d4044b to be7153e Compare September 26, 2017 13:00

ironcladlou changed the title ~~WIP: Rebase kubernetes 1.7.6~~ Rebase kubernetes 1.7.6 Sep 27, 2017

liggitt reviewed Oct 2, 2017

View reviewed changes

Robert Rati and others added 16 commits October 3, 2017 08:56

UPSTREAM: 48612: Warn if cluster ID is missing for AWS

5c98bb2

:100644 100644 2b0ff8c2c7... 3d05185057... M pkg/cloudprovider/providers/aws/tags.go

UPSTREAM: 48226: Log get PVC/PV errors in MaxPD predicate only at hig…

f0f24db

…h verbosity. :100644 100644 b123c5a7a2... 7e25e48435... M plugin/pkg/scheduler/algorithm/predicates/BUILD :100644 100644 95939bf504... 06deb30149... M plugin/pkg/scheduler/algorithm/predicates/predicates.go

UPSTREAM: 52597: Support flag round tripping

f5be66a

:100644 100644 d7da1ba0ce... 9eec35352a... M pkg/apis/componentconfig/helpers.go :100644 100644 b001433753... 613d41c3c1... M pkg/util/taints/taints.go

UPSTREAM: <carry>: increase timeout in TestCancelAndReadd even more

46bb66b

:100644 100644 31228219fe... 72987e330d... M pkg/controller/node/timed_workers_test.go

UPSTREAM: 52297: Use cAdvisor constant for crio imagefs

c8ebce7

:100644 100644 a9e88b5bf8... 94af5d39de... M pkg/kubelet/cadvisor/helpers_linux.go

UPSTREAM: 52030: Fill in creationtimestamp in audit events

6bf40ee

:100644 100644 2de7bc1733... c65c6119c7... M staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go

UPSTREAM: 51782: A policy with 0 rules should return an error

fe3d5be

:100644 100644 2fcce4da75... 195340ecbd... M staging/src/k8s.io/apiserver/pkg/audit/policy/reader.go :100644 100644 be76364f59... 3eabbd3cb3... M staging/src/k8s.io/apiserver/pkg/audit/policy/reader_test.go

UPSTREAM: google/cadvisor: 1741: add CRI-O handler

754741e

ironcladlou force-pushed the rebase-1.7.6 branch 2 times, most recently from 2c4da71 to a08f5ee Compare October 3, 2017 13:12

UPSTREAM: <drop>: generated updates

a08f5ee

soltysh merged commit ad0dbed into openshift:release-1.7.6 Oct 4, 2017

soltysh mentioned this pull request Oct 4, 2017

Rebase 1.7.6 openshift/origin#16615

Merged

ironcladlou mentioned this pull request Oct 5, 2017

3.7 pick list openshift/origin#16361

Closed

52 tasks

		@@ -1 +1 @@
		9009938f67
		87ceff292ab199dc902b52f942951f1b7b88e4fa

		@@ -50,7 +50,6 @@ import (
		"k8s.io/kubernetes/pkg/volume/local"

		@@ -251,18 +251,20 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
		return nil

Rebase kubernetes 1.7.6 #42

Rebase kubernetes 1.7.6 #42

Conversation

ironcladlou commented Sep 22, 2017 • edited Loading

ironcladlou commented Sep 22, 2017

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

soltysh commented Sep 29, 2017

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

liggitt Oct 2, 2017 • edited Loading

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

ironcladlou commented Oct 3, 2017

liggitt commented Oct 3, 2017 • edited Loading

liggitt commented Oct 3, 2017

liggitt commented Oct 3, 2017 • edited Loading

soltysh commented Oct 3, 2017

soltysh commented Oct 3, 2017

soltysh commented Oct 4, 2017

sttts commented Oct 4, 2017

ironcladlou commented Sep 22, 2017 •

edited

Loading

liggitt Oct 2, 2017 •

edited

Loading

liggitt commented Oct 3, 2017 •

edited

Loading

liggitt commented Oct 3, 2017 •

edited

Loading