Use apps/v1 Deployment/ReplicaSet in controller and kubectl #61419

enisoc · 2018-03-20T17:44:53Z

This updates the Deployment controller and integration/e2e tests to use apps/v1, as part of #55714.

This also requires updating any other components that use the deployment/util package, most notably kubectl. That means client versions 1.11 and above will only work with server versions 1.9 and above. This is well within our client-server version skew policy of +/-1 minor version.

However, this PR only updates the parts of kubectl that used deployment/util. So although kubectl now requires apps/v1, it still also depends on extensions/v1beta1. Migrating other parts of kubectl to apps/v1 is beyond the scope of this PR, which was just to change the Deployment controller and fix all the fallout.

kubectl: This client version requires the `apps/v1` APIs, so it will not work against a cluster version older than v1.9.0. Note that kubectl only guarantees compatibility with clusters that are +/-1 minor version away.

@janetkuo

Automatic merge from submit-queue (batch tested with PRs 60980, 61273, 60811, 61021, 61367). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Use apps/v1 ReplicaSet in controller and tests. This updates the RS/RC controller and RS integration/e2e tests to use apps/v1 ReplicaSet, as part of #55714. It does *not* update the Deployment controller, nor its integration/e2e tests, to use apps/v1 ReplicaSet. That will be done in a separate PR (#61419) because Deployment has many more tendrils embedded throughout the system. ```release-note Conformance: ReplicaSet must be supported in the `apps/v1` version. ``` /assign @janetkuo

krmayankk · 2018-04-10T21:39:54Z

@enisoc is there any impact when customers upgrade from extensions/v1beta1 Deployments to apps/v1 ? More specifically we have a controller that continuously applies extensions/v1beta1/Deployments , when i upgrade to k8s, which supports apps1/v1 , can i switch my controller to start applying apps/v1/Deployments for the same name, and there will be no impact ?

liggitt · 2018-04-10T21:44:21Z

is there any impact when customers upgrade from extensions/v1beta1 Deployments to apps/v1 ?

all of the deployments currently persisted can be fetched/updated as either extensions/v1beta1 or as apps/v1

More specifically we have a controller that continuously applies extensions/v1beta1/Deployments , when i upgrade to k8s, which supports apps1/v1 , can i switch my controller to start applying apps/v1/Deployments for the same name, and there will be no impact ?

If you mean kubectl apply, it has always had issues with cross-group or version changes - #16543 (comment)

If you mean once the objects are persisted as API objects, there is no impact what API version the controller uses to interact with it

krmayankk · 2018-04-10T21:52:59Z

@liggitt our controller uses client-go. we have a controller thats takes git repo yamls and keeps applying them to k8s using client-go(Update calls on extensions.v1beta1), once we move to newer k8s versions, i woukd like to switch our client-go code to start applying, apps/v1/Deployments for existing Deployments. I am guessing for existing Deployments, they are persisted as the latest version supported, so once i switch, nothing should change and no restarts of existing pods should happen. It would be good to document this somewhere

janetkuo · 2018-04-11T00:21:40Z

once we move to newer k8s versions, i woukd like to switch our client-go code to start applying, apps/v1/Deployments for existing Deployments

apps/v1 APIs are different and you need to be aware of those differences when switching. For example, some default values are different, selectors become immutable, and some fields are deprecated.

We don't have docs for apps/v1 but just the docs for comparing apps/v1beta2 and extensions/v1beta1: https://kubernetes.io/docs/reference/workloads-18-19/
cc @kow3ns we need to update this doc (kubernetes/website#8049)

liggitt · 2018-05-12T04:07:32Z

LGTM

janetkuo · 2018-05-15T18:33:01Z

/lgtm

soltysh

/lgtm

soltysh · 2018-05-22T11:33:35Z

pkg/controller/controller_utils.go

@@ -25,8 +25,8 @@ import (
 	"sync/atomic"
 	"time"

+	apps "k8s.io/api/apps/v1"


Use appsv1 to clearly show we're working with v1 version. It's a pattern used through the entire code base.

In this PR, I only wanted to do mechanical translations from extensions to apps. That makes it easy to see that the transform is the one we intended. If we want to fix the style, I think it should be a separate PR.

soltysh · 2018-05-22T11:45:57Z

pkg/kubectl/history.go

@@ -102,12 +102,12 @@ type DeploymentHistoryViewer struct {
 // ViewHistory returns a revision-to-replicaset map as the revision history of a deployment
 // TODO: this should be a describer
 func (h *DeploymentHistoryViewer) ViewHistory(namespace, name string, revision int64) (string, error) {
-	versionedExtensionsClient := h.c.ExtensionsV1beta1()
-	deployment, err := versionedExtensionsClient.Deployments(namespace).Get(name, metav1.GetOptions{})
+	versionedAppsClient := h.c.AppsV1()


Have you checked if these commands work fine with previous version of the server, it should but I'm asking to have that double checked.

I checked a build of kubectl from this PR against a v1.9.3 cluster, and the following commands worked:

kubectl edit deployment <x> (to create history) kubectl rollout history deployment/<x> kubectl rollout undo deployment/<x> kubectl rollout status deployment/<x>

We also have automated kubectl skew tests that should run post-submit.

As expected, I observed that the rollout commands do not work against a v1.8.9 cluster, because apps/v1 did not exist until v1.9.0. This is fine because this change will roll out with kubectl v1.11 at the earliest, and v1.8 clusters are outside the client/server compatibility window for that release.

enisoc · 2018-05-22T20:39:53Z

/assign @lavalamp

Can you approve for cmd/kube-controller-manager?

This is necessary since kubectl shares code with the controllers, and the controllers have been updated to use apps/v1.

This must be done at the same time as the controller update, since they share code.

lavalamp · 2018-05-23T18:28:20Z

/approve

for the kube-controller-manager change.

enisoc · 2018-05-23T18:30:02Z

/retest

janetkuo · 2018-05-23T18:31:17Z

/lgtm

k8s-ci-robot · 2018-05-23T18:31:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enisoc, janetkuo, lavalamp, soltysh

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:

~~cmd/kube-controller-manager/OWNERS~~ [lavalamp]
~~pkg/controller/OWNERS~~ [janetkuo,lavalamp]
~~pkg/kubectl/OWNERS~~ [janetkuo,lavalamp,soltysh]
~~pkg/printers/OWNERS~~ [janetkuo,lavalamp,soltysh]
~~test/OWNERS~~ [enisoc,janetkuo,lavalamp,soltysh]

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

k8s-github-robot · 2018-05-24T01:14:11Z

Automatic merge from submit-queue (batch tested with PRs 62756, 63862, 61419, 64015, 64063). If you want to cherry-pick this change to another branch, please follow the instructions here.

soltysh · 2018-05-24T09:58:00Z

🎉 extensions die 🎉

enisoc added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. sig/apps Categorizes an issue or PR as relevant to SIG Apps. labels Mar 20, 2018

enisoc assigned janetkuo Mar 20, 2018

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 20, 2018

k8s-ci-robot requested review from deads2k, dshulyak, foxish, ghodss, janetkuo, jingxu97, lavalamp, liggitt, nikhiljindal, soltysh, sttts and tnozicka March 20, 2018 17:45

enisoc force-pushed the apps-v1-deploy branch from 1734225 to bb9abd5 Compare March 20, 2018 17:57

This was referenced Mar 20, 2018

Deployment is incompatible with apps/v1 ReplicaSet #61433

Closed

Use apps/v1 ReplicaSet in controller and tests. #61367

Merged

janetkuo mentioned this pull request Mar 21, 2018

Migrate kubectl to use apps/v1 instead of extensions/v1beta1 #61430

Closed

5 tasks

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 23, 2018

fisherxu mentioned this pull request Mar 27, 2018

WIP:Move the internal deployment/replica_set from extensions to apps #61755

Closed

kow3ns added this to In Progress in Workloads Mar 29, 2018

janetkuo approved these changes May 15, 2018

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 15, 2018

k8s-ci-robot assigned soltysh May 22, 2018

soltysh approved these changes May 22, 2018

View reviewed changes

k8s-ci-robot assigned lavalamp May 22, 2018

enisoc added 6 commits May 22, 2018 13:42

Use apps/v1 in Deployment controller.

e32a155

kubectl: Use apps/v1 Deployment/ReplicaSet.

1c531fc

This is necessary since kubectl shares code with the controllers, and the controllers have been updated to use apps/v1.

test/e2e: Use apps/v1 Deployment/ReplicaSet.

a6a5190

This must be done at the same time as the controller update, since they share code.

test/integration: Use apps/v1 Deployment/ReplicaSet.

680bc4b

This must be done at the same time as the controller update, since they share code.

Set explicit labels/selector for apps/v1 Deployment/RS.

436db71

e2e/auth: Expect apps/v1 Deployment calls in audit test.

046ae81

enisoc force-pushed the apps-v1-deploy branch from 9687e1c to 046ae81 Compare May 22, 2018 20:43

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 22, 2018

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 23, 2018

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2018

k8s-github-robot merged commit 5fe35cd into kubernetes:master May 24, 2018

Workloads automation moved this from In Progress to Done May 24, 2018

enisoc deleted the apps-v1-deploy branch May 24, 2018 17:51

This was referenced Jul 10, 2018

K8s 110 ci with fixes Shopify/krane#308

Merged

1.10.0 ProgressDeadlineSeconds default added to v1beta1 deployment #66135

Closed

andrewsykim mentioned this pull request Aug 28, 2018

Deployment status does not match ReplicaSet or Pods #67974

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use apps/v1 Deployment/ReplicaSet in controller and kubectl #61419

Use apps/v1 Deployment/ReplicaSet in controller and kubectl #61419

enisoc commented Mar 20, 2018 •

edited

Loading

krmayankk commented Apr 10, 2018

liggitt commented Apr 10, 2018 •

edited

Loading

krmayankk commented Apr 10, 2018

janetkuo commented Apr 11, 2018 •

edited

Loading

liggitt commented May 12, 2018

janetkuo commented May 15, 2018

soltysh left a comment

soltysh May 22, 2018

enisoc May 22, 2018

soltysh May 22, 2018

enisoc May 22, 2018

enisoc commented May 22, 2018

lavalamp commented May 23, 2018

enisoc commented May 23, 2018

janetkuo commented May 23, 2018

k8s-ci-robot commented May 23, 2018

k8s-github-robot commented May 24, 2018

soltysh commented May 24, 2018

Use apps/v1 Deployment/ReplicaSet in controller and kubectl #61419

Use apps/v1 Deployment/ReplicaSet in controller and kubectl #61419

Conversation

enisoc commented Mar 20, 2018 • edited Loading

krmayankk commented Apr 10, 2018

liggitt commented Apr 10, 2018 • edited Loading

krmayankk commented Apr 10, 2018

janetkuo commented Apr 11, 2018 • edited Loading

liggitt commented May 12, 2018

janetkuo commented May 15, 2018

soltysh left a comment

Choose a reason for hiding this comment

soltysh May 22, 2018

Choose a reason for hiding this comment

enisoc May 22, 2018

Choose a reason for hiding this comment

soltysh May 22, 2018

Choose a reason for hiding this comment

enisoc May 22, 2018

Choose a reason for hiding this comment

enisoc commented May 22, 2018

lavalamp commented May 23, 2018

enisoc commented May 23, 2018

janetkuo commented May 23, 2018

k8s-ci-robot commented May 23, 2018

k8s-github-robot commented May 24, 2018

soltysh commented May 24, 2018

enisoc commented Mar 20, 2018 •

edited

Loading

liggitt commented Apr 10, 2018 •

edited

Loading

janetkuo commented Apr 11, 2018 •

edited

Loading