Use new templates for cilium 1.8 #9424

olemarkus · 2020-06-22T09:12:34Z

WIP at least until cilium 1.8 has been released.

Using a new template here since cilium templates have changed quite a bit for 1.8.

Also adding support for hubble. Right now, it is just possible to enable it. But need to add support for metrics at least. Not 100% decided if hubble-relay should be part of the addon or not. Possibly leave it to the user to install relay (and ui)

pkg/apis/kops/v1alpha2/networking.go

pkg/apis/kops/networking.go

pkg/apis/kops/v1alpha2/networking.go

olemarkus · 2020-06-24T19:15:08Z

/assign @rifelpet

pkg/apis/kops/networking.go

pkg/apis/kops/validation/validation.go

johngmyers · 2020-06-24T20:50:17Z

pkg/model/components/cilium.go

@@ -39,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
 		if b.Context.IsKubernetesLT("1.12.0") {
 			c.Version = "v1.6.9"
 		} else {
-			c.Version = "v1.7.4"
+			c.Version = "v1.8.0-rc4"


Shouldn't we default to a release version?
I'm wondering if we would want k8s 1.17 and earlier to stay on 1.7.

We should now that 1.8.0 is actually released. Will fix.

Normally we don't do this with CNIs unless there are manifest incompatibilities, but the code changes I've made makes this an option. I am neutral on this.

johngmyers · 2020-06-24T20:53:08Z

pkg/wellknownports/wellknownports.go

+	CiliumPrometheusPort = 9090
+
+	// CiliumHubblePrometheusPort is the default port where Hubble exposes metrics
+	CiliumHubblePrometheusPort = 9091


Are these host network? I think we want wellknownports (or at least something) to track the host-network ports.

Yep. These ports are exposed on the CNI agent itself.

johngmyers · 2020-06-24T20:57:35Z

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml

  - id: k8s-1.12
    kubernetesVersion: '>=1.12.0'
-    manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: 61f05c6e376a570b3f1e53d6b0b2ed9e63cf4c50
+    manifest: networking.cilium.io/k8s-1.12-v1.8.yaml


Perhaps add a test for configuring Cilium to 1.7?

Yep. That makes sense.

olemarkus

Thanks for spotting my silly mistakes.

olemarkus · 2020-06-25T06:55:29Z

pkg/wellknownports/wellknownports.go

+	CiliumPrometheusPort = 9090
+
+	// CiliumHubblePrometheusPort is the default port where Hubble exposes metrics
+	CiliumHubblePrometheusPort = 9091


Yep. These ports are exposed on the CNI agent itself.

olemarkus · 2020-06-25T06:56:58Z

pkg/model/components/cilium.go

@@ -39,7 +40,7 @@ func (b *CiliumOptionsBuilder) BuildOptions(o interface{}) error {
 		if b.Context.IsKubernetesLT("1.12.0") {
 			c.Version = "v1.6.9"
 		} else {
-			c.Version = "v1.7.4"
+			c.Version = "v1.8.0-rc4"


We should now that 1.8.0 is actually released. Will fix.

Normally we don't do this with CNIs unless there are manifest incompatibilities, but the code changes I've made makes this an option. I am neutral on this.

olemarkus · 2020-06-25T06:57:31Z

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml

  - id: k8s-1.12
    kubernetesVersion: '>=1.12.0'
-    manifest: networking.cilium.io/k8s-1.12.yaml
-    manifestHash: 61f05c6e376a570b3f1e53d6b0b2ed9e63cf4c50
+    manifest: networking.cilium.io/k8s-1.12-v1.8.yaml


Yep. That makes sense.

olemarkus · 2020-06-25T09:13:19Z

/retest

pkg/apis/kops/validation/validation.go

hakman · 2020-06-29T06:33:08Z

/lgtm

olemarkus · 2020-06-29T07:23:20Z

Hm. Nodeup is slower than usual.

/retest

olemarkus · 2020-06-30T09:01:15Z

/retest

olemarkus · 2020-06-30T09:18:49Z

/retest

olemarkus · 2020-06-30T09:47:41Z

/retest

hakman · 2020-06-30T09:51:27Z

/lgtm

hakman · 2020-07-02T13:27:16Z

@johngmyers any other thoughts here, or it's good from your point of view also?

johngmyers · 2020-07-02T14:32:20Z

Good from my point of view.

rifelpet · 2020-07-02T22:11:33Z

/approve

k8s-ci-robot · 2020-07-02T22:11:50Z

[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

fejta-bot · 2020-07-03T00:28:39Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

fejta-bot · 2020-07-03T02:34:33Z

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

rifelpet · 2020-07-03T03:06:56Z

/lgtm cancel

might need a rebase + hack/update-* scripts to fix the failing jobs

hakman · 2020-07-03T07:09:07Z

/lgtm

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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. area/addons labels Jun 22, 2020

k8s-ci-robot requested review from mikesplain and zetaab June 22, 2020 09:13

k8s-ci-robot added the area/api label Jun 22, 2020

johngmyers requested changes Jun 22, 2020

View reviewed changes

olemarkus force-pushed the cilium-1.18 branch 4 times, most recently from 35d1ec0 to fc03eb9 Compare June 24, 2020 17:44

olemarkus changed the title ~~WIP: Use new templates for cilium 1.8~~ Use new templates for cilium 1.8 Jun 24, 2020

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 24, 2020

k8s-ci-robot assigned rifelpet Jun 24, 2020

johngmyers requested changes Jun 24, 2020

View reviewed changes

olemarkus commented Jun 25, 2020

View reviewed changes

olemarkus force-pushed the cilium-1.18 branch from f00d502 to 1331fd8 Compare June 25, 2020 08:05

hakman reviewed Jun 26, 2020

View reviewed changes

pkg/apis/kops/validation/validation.go Outdated Show resolved Hide resolved

hakman reviewed Jun 26, 2020

View reviewed changes

pkg/apis/kops/validation/validation.go Outdated Show resolved Hide resolved

k8s-ci-robot added the area/provider/spotinst Issues or PRs related to spotinst provider label Jun 29, 2020

k8s-ci-robot assigned hakman Jun 29, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2020

olemarkus force-pushed the cilium-1.18 branch from 911a8a4 to 79fcce3 Compare June 30, 2020 08:36

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 30, 2020

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 30, 2020

aanm approved these changes Jun 30, 2020

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 2, 2020

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 3, 2020

Ole Markus With added 2 commits July 3, 2020 07:56

Use new templates for cilium 1.8

263172c

Rebase with master

53f670a

olemarkus force-pushed the cilium-1.18 branch from 79fcce3 to 53f670a Compare July 3, 2020 06:53

go mod tidy

e2ecceb

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 3, 2020

k8s-ci-robot merged commit f33a5e7 into kubernetes:master Jul 3, 2020

k8s-ci-robot added this to the v1.19 milestone Jul 3, 2020

olemarkus deleted the cilium-1.18 branch July 7, 2020 17:06

agilgur5 mentioned this pull request Feb 16, 2021

kOps 1.19 sets Cilium enableRemoteNodeIdentity to true by default, which is a breaking change #10836

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use new templates for cilium 1.8 #9424

Use new templates for cilium 1.8 #9424

olemarkus commented Jun 22, 2020

olemarkus commented Jun 24, 2020

johngmyers Jun 24, 2020

olemarkus Jun 25, 2020

johngmyers Jun 24, 2020

olemarkus Jun 25, 2020

johngmyers Jun 24, 2020

olemarkus Jun 25, 2020

olemarkus left a comment

olemarkus Jun 25, 2020

olemarkus Jun 25, 2020

olemarkus Jun 25, 2020

olemarkus commented Jun 25, 2020

hakman commented Jun 29, 2020

olemarkus commented Jun 29, 2020

olemarkus commented Jun 30, 2020

olemarkus commented Jun 30, 2020

olemarkus commented Jun 30, 2020

hakman commented Jun 30, 2020

hakman commented Jul 2, 2020

johngmyers commented Jul 2, 2020

rifelpet commented Jul 2, 2020

k8s-ci-robot commented Jul 2, 2020

fejta-bot commented Jul 3, 2020

fejta-bot commented Jul 3, 2020

rifelpet commented Jul 3, 2020 •

edited

Loading

hakman commented Jul 3, 2020

Use new templates for cilium 1.8 #9424

Use new templates for cilium 1.8 #9424

Conversation

olemarkus commented Jun 22, 2020

olemarkus commented Jun 24, 2020

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

olemarkus left a 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

olemarkus commented Jun 25, 2020

hakman commented Jun 29, 2020

olemarkus commented Jun 29, 2020

olemarkus commented Jun 30, 2020

olemarkus commented Jun 30, 2020

olemarkus commented Jun 30, 2020

hakman commented Jun 30, 2020

hakman commented Jul 2, 2020

johngmyers commented Jul 2, 2020

rifelpet commented Jul 2, 2020

k8s-ci-robot commented Jul 2, 2020

fejta-bot commented Jul 3, 2020

fejta-bot commented Jul 3, 2020

rifelpet commented Jul 3, 2020 • edited Loading

hakman commented Jul 3, 2020

rifelpet commented Jul 3, 2020 •

edited

Loading