v1.7 backports 2020-03-02 by brb · Pull Request #10401 · cilium/cilium

brb · 2020-03-02T09:54:26Z

v1.7 backports 2020-03-02

doc: Fix links to contributing guide #10322 -- doc: Fix links to contributing guide (@CybrPunk)
install: Support generating vX.Y-dev charts #10355 -- install: Support generating vX.Y-dev charts (@joestringer)
bpf: Fix native dev cleanup #10352 -- bpf: Fix native dev cleanup (@brb)
add getting started guide for BIRD #10326 -- add getting started guide for BIRD (@ArthurChiao)
etcd: Fix gRPC load balancer issue #10381 -- etcd: Fix gRPC load balancer issue (@tgraf)
metrics: add missing metrics for cilium agent api handler #10376 -- metrics: add missing metrics for cilium agent api handler (@fristonio)
cilium: fix node-port range parsing from helm and update docs #10382 -- cilium: fix node-port range parsing from helm and update docs (@borkmann)
AKS: Fix dynamic reconfiguration of bridge mode #10383 -- AKS: Fix dynamic reconfiguration of bridge mode (@tgraf)
bpf: Fix typo in max options for bpf_lb #10386 -- bpf: Fix typo in max options for bpf_lb (@pchaigno)
test: Avoid using global map for Cilium configuration #10388 -- test: Avoid using global map for Cilium configuration (@brb)

NOTE:

@mrostecki re datapath: Switch to upstream bpftool, remove additional arguments #10353: I haven't backported it yet. Have you built cilium-runtime:2020-02-27-v1.7?
@tgraf re etcd: Fix gRPC load balancer issue #10381: There were some conflicts in go.mod, go.sum and vendor/modules.txt. I fixed the one in go.mod, and then ran go mod tidy (with go 1.13) to fix the latter files. Please check whether everything is OK.

Once this PR is merged, you can update the PR labels via:

$ for pr in 10322 10355 10352 10326 10381 10376 10382 10383 10386 10388; do contrib/backporting/set-labels.py $pr done 1.7; done

This change is

[ upstream commit f8b65ed ] * Fix maintainers little helper link to contributing docs * Fix contributing link in readme Fixes: #10316 Signed-off-by: Sean Winn <sean@isovalent.com> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit 6e5fcbb ] Step 1: Change VERSION file to contain X.Y-dev Step 2: make -C install/kubernetes Step 3: Generate helm templates Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit 0c67ebf ] Fixes: 1239278 ("bpf: Remove bpf_netdev.o from previously used devices") Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit 9eed6e2 ] ref #10160 Signed-off-by: ArthurChiao <arthurchiao@hotmail.com> Signed-off-by: Martynas Pumputis <m@lambda.lt>

brb · 2020-03-02T09:54:49Z

never-tell-me-the-odds

pchaigno

👍 for my change.

brb · 2020-03-02T10:15:41Z

never-tell-me-the-odds

aanm

@brb please apply the following diff and squash it with the commit "etcd: Fix gRPC load balancer issue"

diff --git a/go.mod b/go.mod
index b71792be0..242740809 100644
--- a/go.mod
+++ b/go.mod
@@ -71,7 +71,7 @@ require (
        github.com/spf13/pflag v1.0.5
        github.com/spf13/viper v1.6.1
        github.com/vishvananda/netlink v1.0.1-0.20191113183427-d71301a47b60
-       go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
+       go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
        golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
        golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
        golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
@@ -549,7 +549,7 @@ replace (
        github.com/xlab/treeprint => github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6
        github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77
        go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.3
-       go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20190911215424-9ed5f76dc03b
+       go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
        go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.1.2
        go.opencensus.io => go.opencensus.io v0.21.0
        go.uber.org/atomic => go.uber.org/atomic v1.3.2
diff --git a/go.sum b/go.sum
index 361fe95f5..2ebf99536 100644
--- a/go.sum
+++ b/go.sum
@@ -550,8 +550,8 @@ github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6Ut
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/etcd v0.5.0-alpha.5.0.20190911215424-9ed5f76dc03b h1:zzmfsfPYodEcRFxxFVHWBVMkgYj94ZmfhPNORD6eoiU=
-go.etcd.io/etcd v0.5.0-alpha.5.0.20190911215424-9ed5f76dc03b/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
+go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 h1:lWF4f9Nypl1ZqSb4gLeh/DGvBYVaUYHuiB93teOmwgc=
+go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 65f190267..28f885652 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -395,7 +395,7 @@ github.com/vishvananda/netlink
 github.com/vishvananda/netlink/nl
 # github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df => github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f
 github.com/vishvananda/netns
-# go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738
+# go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 => go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
 go.etcd.io/etcd/auth/authpb
 go.etcd.io/etcd/clientv3
 go.etcd.io/etcd/clientv3/balancer

vadorovsky · 2020-03-02T11:07:35Z

@brb

* re #10353: I haven't backported it yet. Have you built `cilium-runtime:2020-02-27-v1.7`?

I didn't and ~~I'm not sure if I'm even able to push container images to dockerhub or quay. I will check.~~ don't have rights to do that.

[ upstream commit 26e3ca0 ] This bumps the etcd dependency in order to pull in github.com/etcd-io/etcd/pull/11184 which is required to fix a gRPC load balancer issue when using a k8s service name to connect to etcd. Fixes: #9791 Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit 6414719 ] Signed-off-by: Deepesh Pathak <deepshpathak@gmail.com> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit cdafe68 ] Right now setting NodePort range via helm is broken, similarly as described in b365463 ("helm: fix host reachable services template for cilium config map") for host-reachable services when we would want to specify 'tcp,udp'. Given latter is default, it does not matter that much, but users ran into the same issue for the NodePort range where the string slice from configmap gets flattened into a string slice of 1 element with a comma-separated list thus resulting into parsing errors. Detect and fix both cases by strings.Split() on the comma. Fixes: #10375 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit e13628d ] Helm is a mess in that it needs a workaround to specify the comma through '\,'. Given this is non-obvious, add an example. Fixes: #10375 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit b0a3d92 ] ... and that this will be fixed in future Cilium versions. Related: #10359 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit 0829785 ] Commit 0b70117 ("doc: Fix AKS guide regression") has re-introduced the dynamic reconfiguration of the Azure bridge into transport mode in order to enable transparent proxy operations. The commit has incorrectly done so by adding the reconfiguration step in the preStop instead of the postStart hook. This required the Cilium pod to restart once in order to reconfigure the bridge and thus delayed the bootstrapping time. Fixes: 0b70117 ("doc: Fix AKS guide regression") has re-introduced the Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit 302831a ] ENABLE_HOST_SERVICES_UDP wasn't set when trying to max out the BPF program complexity. Signed-off-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt>

[ upstream commit 2206041 ] The same instance of the configuration map is shared among the tests. So, any modification to the map might unintentionally influence non-related test case. Signed-off-by: Martynas Pumputis <m@lambda.lt>

brb · 2020-03-02T17:39:54Z

never-tell-me-the-odds

fristonio

Looks good for my change as well.

brb · 2020-03-03T08:14:40Z

make test-docs will be fixed by #10419.

joestringer · 2020-03-04T00:58:01Z

Filed #10442 to follow up on potential CI flake.

joestringer · 2020-03-04T00:58:16Z

test-missed-k8s

joestringer · 2020-03-04T00:58:22Z

test-docs-please

joestringer · 2020-03-04T05:41:20Z

Documented flake in #10447 .

joestringer · 2020-03-04T05:41:54Z

test-missed-k8s

vadorovsky

Looks good. My change got backported in an another PR.

joestringer · 2020-03-04T18:56:51Z

Hit known flake #9330 on one of the missed k8s builds. That's fine to ignore for now.

I've double-checked @tgraf's commits as well and the functional change looks right.

Merging.

CybrPunk and others added 4 commits March 2, 2020 10:01

doc: Fix links to contributing guide

d05df91

[ upstream commit f8b65ed ] * Fix maintainers little helper link to contributing docs * Fix contributing link in readme Fixes: #10316 Signed-off-by: Sean Winn <sean@isovalent.com> Signed-off-by: Martynas Pumputis <m@lambda.lt>

install: Support generating vX.Y-dev charts

b98008f

[ upstream commit 6e5fcbb ] Step 1: Change VERSION file to contain X.Y-dev Step 2: make -C install/kubernetes Step 3: Generate helm templates Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt>

bpf: Fix native dev cleanup

0993b2f

[ upstream commit 0c67ebf ] Fixes: 1239278 ("bpf: Remove bpf_netdev.o from previously used devices") Signed-off-by: Martynas Pumputis <m@lambda.lt>

add getting started guide for BIRD

8b98d62

[ upstream commit 9eed6e2 ] ref #10160 Signed-off-by: ArthurChiao <arthurchiao@hotmail.com> Signed-off-by: Martynas Pumputis <m@lambda.lt>

brb added pending-review kind/backports This PR provides functionality previously merged into master. labels Mar 2, 2020

brb requested review from borkmann, fristonio, joestringer, pchaigno and tgraf March 2, 2020 09:54

brb requested review from a team as code owners March 2, 2020 09:54

brb changed the title ~~Pr/v1.7 backport 2020 02 28~~ v1.7 backports 2020-03-02 Mar 2, 2020

pchaigno approved these changes Mar 2, 2020

View reviewed changes

brb force-pushed the pr/v1.7-backport-2020-02-28 branch from c91e5de to 64f95ce Compare March 2, 2020 10:15

aanm requested changes Mar 2, 2020

View reviewed changes

tgraf and others added 8 commits March 2, 2020 18:37

metrics: add missing metrics for cilium agent api handler

e6d53e7

[ upstream commit 6414719 ] Signed-off-by: Deepesh Pathak <deepshpathak@gmail.com> Signed-off-by: Martynas Pumputis <m@lambda.lt>

docs: document kube-proxy replacement chainingMode=portmap limitation

1347d34

[ upstream commit b0a3d92 ] ... and that this will be fixed in future Cilium versions. Related: #10359 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Martynas Pumputis <m@lambda.lt>

bpf: Fix typo in max options for bpf_lb

1986cab

[ upstream commit 302831a ] ENABLE_HOST_SERVICES_UDP wasn't set when trying to max out the BPF program complexity. Signed-off-by: Paul Chaignon <paul@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt>

brb force-pushed the pr/v1.7-backport-2020-02-28 branch from 64f95ce to ea05ae9 Compare March 2, 2020 17:39

fristonio approved these changes Mar 2, 2020

View reviewed changes

brb requested a review from aanm March 2, 2020 21:26

joestringer mentioned this pull request Mar 4, 2020

CI: v1.7: .K8sServicesTest External services To Services first endpoint creation: Endpoints are not ready after timeout #10442

Closed

tgraf approved these changes Mar 4, 2020

View reviewed changes

vadorovsky approved these changes Mar 4, 2020

View reviewed changes

joestringer merged commit 94dd0b6 into v1.7 Mar 4, 2020

joestringer deleted the pr/v1.7-backport-2020-02-28 branch March 4, 2020 18:57

Conversation

brb commented Mar 2, 2020 • edited by tgraf Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

brb commented Mar 2, 2020

Uh oh!

pchaigno left a comment

Choose a reason for hiding this comment

Uh oh!

brb commented Mar 2, 2020

Uh oh!

aanm left a comment

Choose a reason for hiding this comment

Uh oh!

vadorovsky commented Mar 2, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

brb commented Mar 2, 2020

Uh oh!

fristonio left a comment

Choose a reason for hiding this comment

Uh oh!

brb commented Mar 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joestringer commented Mar 4, 2020

Uh oh!

joestringer commented Mar 4, 2020

Uh oh!

joestringer commented Mar 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joestringer commented Mar 4, 2020

Uh oh!

joestringer commented Mar 4, 2020

Uh oh!

vadorovsky left a comment

Choose a reason for hiding this comment

Uh oh!

joestringer commented Mar 4, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

brb commented Mar 2, 2020 •

edited by tgraf

Loading

vadorovsky commented Mar 2, 2020 •

edited

Loading

brb commented Mar 3, 2020 •

edited

Loading

joestringer commented Mar 4, 2020 •

edited

Loading