Canal v3 #5927

gambol99 · 2018-10-12T13:03:21Z

Adding the manifests for kubernetes >=1.9 to move to canal version 3.2.3. Admittedly I don't like the fact the users are unable to override or select the version of canal they wish to use, but as none of the networking specs have this feature so i'm reluctant to add it. The PR upgrades kops cluster running kubernetes >=1.9.0 to canal v3.2.3
adding a check to ensure you cant upgrade with ipvs mode to canal v3.2.3
removing the need for CALICO_IPV4POOL_CIDR environment variable

Tested as working from an upgrade from v2.6.7 ... but needs additional confirmations? ..

Adding the manifests for kubernetes >=1.9 to move to canal version 3.2.3. Admittedly I don't like the fact the users are unable to override or select the version of canal they wish to use, but as none of the networking spec have this feature i'm reluctant to add it. The PR upgrades kops cluster running kubernetes >=1.9.0 to canal v3.2.3

…3.2.3

gambol99 · 2018-10-12T13:04:29Z

/assign @KashifSaadat
/assign @justinsb

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template

KashifSaadat · 2018-10-12T13:40:30Z

pkg/apis/kops/validation/legacy.go

+		// https://docs.projectcalico.org/v3.2/getting-started/kubernetes/requirements
+		if c.Spec.KubeProxy.ProxyMode == "ipvs" {
+			if kubernetesRelease.LT(semver.MustParse("1.9.3")) {
+				// @NOTE: i'm not sure about this one, it could block someone from upgrading i.e. running 1.9.2 + canal + with pre GA ipvs .. perhaps drop?


It's probably better to update the bootstrapchannelbuilder for Canal v3 to only apply on K8s v1.9.3+ and leave the v2.6 deployment to k8s versions below that (KubernetesVersion: ">=1.9.3") . You can then drop the validation code here and users upgrading with ipvs mode shouldn't be blocked.

Yep... that must so much more sense!

KashifSaadat

Thanks this is looking great, and nice to have v3 in finally :)

I've left a couple small comments, but other than that if you've validated the upgrade process from v2.6 to v3+ then LGTM :) Would be good to have another set of eyes over the change.

…the check in validation due to blocking, or locking the version to 1.9.3, as they might not be using ipvs anyway. I'm gonna leave it for another PR or perhaps leave kube admins to decide for now

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

ese

GA apiversions instead deprecated betas. apart it LGTM

ese · 2018-10-12T15:51:17Z

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template

+# as the Calico CNI plugins and network config on
+# each master and worker node in a Kubernetes cluster.
+kind: DaemonSet
+apiVersion: extensions/v1beta1


apps/v1 since kubernetes 1.9. prior are deprecated

ese · 2018-10-12T15:52:49Z

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template

+---
+
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1


rbac.authorization.k8s.io/v1

ese · 2018-10-12T15:53:09Z

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template

+# Flannel roles
+# Pulled from https://github.com/coreos/flannel/blob/master/Documentation/kube-flannel-rbac.yml
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1


rbac.authorization.k8s.io/v1

ese · 2018-10-12T15:53:17Z

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template

+
+# Bind the flannel ClusterRole to the canal ServiceAccount.
+kind: ClusterRoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1


rbac.authorization.k8s.io/v1

ese · 2018-10-12T15:53:30Z

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template

+---
+
+# Bind the ClusterRole to the canal ServiceAccount.
+apiVersion: rbac.authorization.k8s.io/v1beta1


rbac.authorization.k8s.io/v1

gambol99 · 2018-10-12T17:29:30Z

fixed up the api versions .. many thanks @ese :-)

gambol99 · 2018-10-12T21:01:51Z

/hold

gambol99 · 2018-10-12T21:39:20Z

/hold cancel
This one should be good to go now :-) ..

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template

…to flannel v0.9.0

gambol99 · 2018-10-15T08:43:32Z

@KashifSaadat .. done :-)

KashifSaadat · 2018-10-15T08:45:04Z

Awesome, thanks @gambol99 !

/lgtm
/approve

k8s-ci-robot · 2018-10-15T08:45:16Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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,gambol99]

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

gambol99 added 3 commits October 12, 2018 13:29

- adding a check to ensure you cant upgrade with ipvs mode to canal v…

2293523

…3.2.3

- removing the need for CALICO_IPV4POOL_CIDR environment variable

87e587f

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 12, 2018

k8s-ci-robot requested review from chrisz100 and robinpercy October 12, 2018 13:03

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

k8s-ci-robot assigned justinsb and KashifSaadat Oct 12, 2018

KashifSaadat reviewed Oct 12, 2018

View reviewed changes

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template Outdated Show resolved Hide resolved

KashifSaadat reviewed Oct 12, 2018

View reviewed changes

KashifSaadat suggested changes Oct 12, 2018

View reviewed changes

- actually dropping the check on the ipvs module is feels hacky with …

01bc597

…the check in validation due to blocking, or locking the version to 1.9.3, as they might not be using ipvs anyway. I'm gonna leave it for another PR or perhaps leave kube admins to decide for now

KashifSaadat reviewed Oct 12, 2018

View reviewed changes

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go Show resolved Hide resolved

ese reviewed Oct 12, 2018

View reviewed changes

- fixing the versions by removing the deprecated apis

5cf62dc

gambol99 force-pushed the canal_v3 branch from 6230b06 to 5cf62dc Compare October 12, 2018 18:22

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

- reverting to flannel v0.9.0 due to issue flannel-io/flannel#938

9f526e9

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

KashifSaadat reviewed Oct 15, 2018

View reviewed changes

upup/models/cloudup/resources/addons/networking.projectcalico.org.canal/k8s-1.9.yaml.template Outdated Show resolved Hide resolved

- updating the manifest description at the top to indicate reverting …

5a214c4

…to flannel v0.9.0

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

k8s-ci-robot merged commit 09654b1 into kubernetes:master Oct 15, 2018

gambol99 deleted the canal_v3 branch October 15, 2018 10:38

jonasrmichel mentioned this pull request Nov 12, 2018

OpenVPN DNS issues with Canal >= v3.0.0 #6068

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Canal v3 #5927

Canal v3 #5927

gambol99 commented Oct 12, 2018 •

edited

Loading

gambol99 commented Oct 12, 2018

KashifSaadat Oct 12, 2018 •

edited

Loading

gambol99 Oct 12, 2018

KashifSaadat left a comment

ese left a comment •

edited

Loading

ese Oct 12, 2018

ese Oct 12, 2018

ese Oct 12, 2018

ese Oct 12, 2018

ese Oct 12, 2018

gambol99 commented Oct 12, 2018 •

edited

Loading

gambol99 commented Oct 12, 2018

gambol99 commented Oct 12, 2018

gambol99 commented Oct 15, 2018

KashifSaadat commented Oct 15, 2018

k8s-ci-robot commented Oct 15, 2018

Canal v3 #5927

Canal v3 #5927

Conversation

gambol99 commented Oct 12, 2018 • edited Loading

gambol99 commented Oct 12, 2018

KashifSaadat Oct 12, 2018 • edited Loading

Choose a reason for hiding this comment

gambol99 Oct 12, 2018

Choose a reason for hiding this comment

KashifSaadat left a comment

Choose a reason for hiding this comment

ese left a comment • edited Loading

Choose a reason for hiding this comment

ese Oct 12, 2018

Choose a reason for hiding this comment

ese Oct 12, 2018

Choose a reason for hiding this comment

ese Oct 12, 2018

Choose a reason for hiding this comment

ese Oct 12, 2018

Choose a reason for hiding this comment

ese Oct 12, 2018

Choose a reason for hiding this comment

gambol99 commented Oct 12, 2018 • edited Loading

gambol99 commented Oct 12, 2018

gambol99 commented Oct 12, 2018

gambol99 commented Oct 15, 2018

KashifSaadat commented Oct 15, 2018

k8s-ci-robot commented Oct 15, 2018

gambol99 commented Oct 12, 2018 •

edited

Loading

KashifSaadat Oct 12, 2018 •

edited

Loading

ese left a comment •

edited

Loading

gambol99 commented Oct 12, 2018 •

edited

Loading