Bump Cilium to 1.7 for k8s 1.12+

[olemarkus]

Cilium 1.7 requires K8s 1.12 minimum. Changed the templates so that we
can have different cilium versions for different k8s versions.

This also mean that this addon will behave similar to other addons wrt
upgrades. Cilium used to add a fixed version to the cluster spec on cluster creation so
upgrades were slightly more manual. Now, for new clusters, upgrades will
happen implicitly with kops updates unless the .Version is added
manually to the cluster spec.

[k8s-ci-robot]

Hi @olemarkus. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[hakman]

/ok-to-test

[hakman]

/lgtm

[johngmyers]

Won't removing this adversely affect version 1.6?

[olemarkus]

Yes you may be right there. I'll add it back in

[johngmyers]

You could put a version conditional in the template.

[olemarkus]

You could put a version conditional in the template.

I would if this was more security sensitive. But this particular change is basically just about dropping the deprecated k8s extensions apis.

[johngmyers]

Instead of baking the logic in the templates, this could have picked the default version by doing check on the Kubernetes version. That would allow other Go code to do Cilium version checks. But we don't have any such Cilium version checks, so not a blocker.

[johngmyers]

/lgtm

[hakman]

Maybe use something like this here?

kops/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

Lines 861 to 866 in 91867ce

	versions := map[string]string{
	"k8s-1.8": "1.5.0-kops.1",
	"k8s-1.10": "1.5.0-kops.2",
	"k8s-1.12": "1.5.5-kops.1",
	"k8s-1.16": "1.6.0-kops.1",
	}

[rifelpet]

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus, rifelpet

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 [rifelpet]

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

[hakman]

Seems that e2e for Cilium is failing after this change. @olemarkus any thoughts?
https://prow.k8s.io/view/gcs/kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-cni-cilium/1230338989827821576

Feb 20 03:57:17 ip-172-20-46-251 kubelet[8295]: E0220 03:57:17.599360    8295 kubelet.go:2183] Container runtime network not ready: NetworkReady=false reason:NetworkPluginNotReady message:docker: network plugin is not ready: cni config uninitialized
Feb 20 03:57:17 ip-172-20-46-251 kubelet[8295]: E0220 03:57:17.730033    8295 remote_image.go:113] PullImage "docker.io/cilium/cilium:v.1.7.0" from image service failed: rpc error: code = Unknown desc = Error response from daemon: manifest for cilium/cilium:v.1.7.0 not found: manifest unknown: manifest unknown
Feb 20 03:57:17 ip-172-20-46-251 kubelet[8295]: E0220 03:57:17.730068    8295 kuberuntime_image.go:50] Pull image "docker.io/cilium/cilium:v.1.7.0" failed: rpc error: code = Unknown desc = Error response from daemon: manifest for cilium/cilium:v.1.7.0 not found: manifest unknown: manifest unknown
Feb 20 03:57:17 ip-172-20-46-251 kubelet[8295]: E0220 03:57:17.730109    8295 kuberuntime_manager.go:801] container start failed: ErrImagePull: rpc error: code = Unknown desc = Error response from daemon: manifest for cilium/cilium:v.1.7.0 not found: manifest unknown: manifest unknown
Feb 20 03:57:17 ip-172-20-46-251 kubelet[8295]: E0220 03:57:17.730135    8295 pod_workers.go:191] Error syncing pod 18f0acff-0eb7-449f-b5fa-c7d6cee008e2 ("cilium-68c4n_kube-system(18f0acff-0eb7-449f-b5fa-c7d6cee008e2)"), skipping: failed to "StartContainer" for "cilium-agent" with ErrImagePull: "rpc error: code = Unknown desc = Error response from daemon: manifest for cilium/cilium:v.1.7.0 not found: manifest unknown: manifest unknown"
Feb 20 03:57:18 ip-172-20-46-251 kubelet[8295]: E0220 03:57:18.268619    8295 pod_workers.go:191] Error syncing pod 18f0acff-0eb7-449f-b5fa-c7d6cee008e2 ("cilium-68c4n_kube-system(18f0acff-0eb7-449f-b5fa-c7d6cee008e2)"), skipping: failed to "StartContainer" for "cilium-agent" with ImagePullBackOff: "Back-off pulling image \"docker.io/cilium/cilium:v.1.7.0\""

My guess is that it's the extra . in the image tag:

kops/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template

Line 402 in ea8c8fb

image: "docker.io/cilium/cilium:{{- or .Version "v.1.7.0" }}"

[olemarkus]

Yep. I'll have a PR momentarily