Update 1.12 addon manifests to use apps/v1, rbac v1 #6397

liggitt · 2019-01-25T06:47:22Z

xref #6273

the first commit is a straight copy of the latest manifest into a 1.12 manifest
the second commit actually makes changes to the manifests
the third commit updates the channel builder logic and test fixtures
the fourth commit bumps cluster-proportional-autoscaler to 1.4.0 so it starts using apps/v1 APIs for scaling (xref Add support for scaling via apps/v1 and v1 APIs kubernetes-sigs/cluster-proportional-autoscaler#54)

liggitt · 2019-01-25T06:48:03Z

cc @justinsb

liggitt · 2019-01-25T06:48:12Z

/hold

liggitt · 2019-01-29T06:00:54Z

/hold cancel

liggitt · 2019-01-29T16:57:29Z

/retest

liggitt · 2019-01-29T17:08:19Z

all other CI jobs on kubernetes/kubernetes#70672 are now green

liggitt · 2019-01-30T02:49:42Z

/retest

chrisz100 · 2019-01-31T19:47:56Z

You being a member of the kubernetes project makes me trust you going least privilege principle with the serviceaccounts you create 👍

/lgtm

liggitt · 2019-01-31T20:15:36Z

You being a member of the kubernetes project makes me trust you going least privilege principle with the serviceaccounts you create 👍

fyi, this didn't change any of the existing roles/bindings... just copied latest manifests and updated API versions

liggitt · 2019-01-31T20:16:38Z

/assign @justinsb
for approval

/retest
(hope springs eternal)

KashifSaadat · 2019-02-20T12:33:57Z

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -668,7 +809,9 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 			"pre-k8s-1.6": "2.4.2-kops.1",
 			"k8s-1.6":     "2.6.9-kops.1",
 			"k8s-1.7":     "2.6.9-kops.1",
+			"k8s-1.12":    "2.6.9-kops.1",


Not sure whether there'd still be an explicit need to keep this / run on 1.12+ with calico v2.6.9? Maybe drop in favour of the new v3.4 manifest which applies with KubernetesVersion: ">=1.12.0", so Calico MajorVersion is effectively defaulted to v3 for k8s v1.12+.

not knowing the history behind having two versions available for 1.7, I wasn't sure if this was a python 2/3 sort of thing where it would make sense to keep both available for 1.12.

I'm happy to collapse onto the v3 version though

KashifSaadat · 2019-02-20T12:36:29Z

upup/pkg/fi/cloudup/bootstrapchannelbuilder_test.go

+		if os.Getenv("UPDATE_CHANNEL_BUILDER_TEST_FIXTURES") == "true" {
+			ioutil.WriteFile(expectedManifestPath, []byte(actualManifest), 0755)
+		} else {
+			t.Logf("to update fixtures automatically, run with UPDATE_CHANNEL_BUILDER_TEST_FIXTURES=true")


KashifSaadat · 2019-02-20T12:41:38Z

All looks great thanks @liggitt ! :)

The E2E tests are fixed now, just needs a rebase and I've left a small comment around the Calico manifest update. As we don't have an official kops v1.12 release yet I think it would be sensible to have Calico v3 as the default for that version onwards.

/test pull-kops-e2e-kubernetes-aws

liggitt · 2019-02-20T14:25:00Z

rebased on master
only included the v3 calico addon in 1.12
re-copied existing templates to 1.12 versions to pick up latest changes:

cp upup/models/cloudup/resources/addons/authentication.aws/k8s-1.10.yaml \
   upup/models/cloudup/resources/addons/authentication.aws/k8s-1.12.yaml
cp upup/models/cloudup/resources/addons/authentication.kope.io/k8s-1.8.yaml \
   upup/models/cloudup/resources/addons/authentication.kope.io/k8s-1.12.yaml
cp upup/models/cloudup/resources/addons/core.addons.k8s.io/k8s-1.7.yaml.template \
   upup/models/cloudup/resources/addons/core.addons.k8s.io/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.6.yaml.template \
   upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.6.yaml.template \
   upup/models/cloudup/resources/addons/dns-controller.addons.k8s.io/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/external-dns.addons.k8s.io/k8s-1.6.yaml.template \
   upup/models/cloudup/resources/addons/external-dns.addons.k8s.io/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.6.yaml.template \
   upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.10.yaml.template \
   upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.7.yaml.template \
   upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml.template \
   upup/models/cloudup/resources/addons/networking.flannel/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml \
   upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.12.yaml
cp upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.6.yaml.template \
   upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.7-v3.yaml.template \
   upup/models/cloudup/resources/addons/networking.projectcalico.org/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/networking.romana/k8s-1.7.yaml.template \
   upup/models/cloudup/resources/addons/networking.romana/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template \
   upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/node-authorizer.addons.k8s.io/k8s-1.10.yaml.template \
   upup/models/cloudup/resources/addons/node-authorizer.addons.k8s.io/k8s-1.12.yaml.template
cp upup/models/cloudup/resources/addons/podsecuritypolicy.addons.k8s.io/k8s-1.10.yaml.template \
   upup/models/cloudup/resources/addons/podsecuritypolicy.addons.k8s.io/k8s-1.12.yaml.template

KashifSaadat · 2019-02-20T15:19:09Z

Awesome work, many thanks!!

/approve
/lgtm

k8s-ci-robot · 2019-02-20T15:19:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: KashifSaadat, liggitt

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~~ [KashifSaadat]

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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 25, 2019

k8s-ci-robot requested review from chrisz100 and robinpercy January 25, 2019 06:47

k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 25, 2019

liggitt force-pushed the extensions-to-apps branch 2 times, most recently from a0a09d6 to a2e8368 Compare January 25, 2019 20:43

liggitt mentioned this pull request Jan 27, 2019

[1.16] Stop serving deprecated beta workload APIs kubernetes/kubernetes#70672

Merged

liggitt force-pushed the extensions-to-apps branch from a2e8368 to 94381c1 Compare January 29, 2019 05:59

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 29, 2019

k8s-ci-robot assigned chrisz100 Jan 31, 2019

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 31, 2019

k8s-ci-robot assigned justinsb Jan 31, 2019

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

KashifSaadat reviewed Feb 20, 2019

View reviewed changes

liggitt added 4 commits February 20, 2019 09:20

Copy latest addons to 1.12

3cef342

Update 1.12 addons to use apps/v1

9a06ff5

Update channel builder

077c7e4

Update cluster-proportional-autoscaler to 1.4.0 to use apps/v1

1ca4514

liggitt force-pushed the extensions-to-apps branch from 94381c1 to 1ca4514 Compare February 20, 2019 14:23

k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 20, 2019

k8s-ci-robot assigned KashifSaadat Feb 20, 2019

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 20, 2019

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

KashifSaadat mentioned this pull request Feb 20, 2019

kops 1.12 configuration for calico: use CRDs #6358

Merged

k8s-ci-robot merged commit 6fecaf0 into kubernetes:master Feb 20, 2019

liggitt mentioned this pull request Feb 20, 2019

Update or add manifests for apps/v1 workload APIs #6273

Closed

liggitt deleted the extensions-to-apps branch February 20, 2019 18:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update 1.12 addon manifests to use apps/v1, rbac v1 #6397

Update 1.12 addon manifests to use apps/v1, rbac v1 #6397

liggitt commented Jan 25, 2019 •

edited

Loading

liggitt commented Jan 25, 2019

liggitt commented Jan 25, 2019

liggitt commented Jan 29, 2019

liggitt commented Jan 29, 2019

liggitt commented Jan 29, 2019

liggitt commented Jan 30, 2019

chrisz100 commented Jan 31, 2019

liggitt commented Jan 31, 2019

liggitt commented Jan 31, 2019

KashifSaadat Feb 20, 2019

liggitt Feb 20, 2019

KashifSaadat Feb 20, 2019

KashifSaadat commented Feb 20, 2019

liggitt commented Feb 20, 2019

KashifSaadat commented Feb 20, 2019

k8s-ci-robot commented Feb 20, 2019

Update 1.12 addon manifests to use apps/v1, rbac v1 #6397

Update 1.12 addon manifests to use apps/v1, rbac v1 #6397

Conversation

liggitt commented Jan 25, 2019 • edited Loading

liggitt commented Jan 25, 2019

liggitt commented Jan 25, 2019

liggitt commented Jan 29, 2019

liggitt commented Jan 29, 2019

liggitt commented Jan 29, 2019

liggitt commented Jan 30, 2019

chrisz100 commented Jan 31, 2019

liggitt commented Jan 31, 2019

liggitt commented Jan 31, 2019

KashifSaadat Feb 20, 2019

Choose a reason for hiding this comment

liggitt Feb 20, 2019

Choose a reason for hiding this comment

KashifSaadat Feb 20, 2019

Choose a reason for hiding this comment

KashifSaadat commented Feb 20, 2019

liggitt commented Feb 20, 2019

KashifSaadat commented Feb 20, 2019

k8s-ci-robot commented Feb 20, 2019

liggitt commented Jan 25, 2019 •

edited

Loading