v1.8 backports 2020-06-05 #11926
Merged
v1.8 backports 2020-06-05 #11926
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ upstream commit 673c3f5 ] Signed-off-by: Glib Smaga <code@gsmaga.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 4e3283c ] Setting tty sock for preloaded VM can interfere with the actual VM being started later. Signed-off-by: Jarno Rajahalme <jarno@covalent.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 11336de ] the 'k8s-app' label of the 'hubble-metrics' service is equal to 'hubble' and not 'cilium' Signed-off-by: Maxime VISONNEAU <maxime.visonneau@gmail.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit f5a7682 ] Signed-off-by: Maciej Kwiek <maciej@isovalent.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 90217c1 ] In case a toServices selected a service that contained more than 1 endpoint, the generated rules could never be deleted. This can easily be reproducible by adding one more endpoint to the unit test of the deleteToCidrFromEndpoint function. Fixes: bae09f7 ("Move ToCIDR gen logic to k8s package") Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 7316fa6 ] This introduces a standard port for the Hubble metrics: 9091. The port is chosen after 9090, which is used by the Cilium metrics. To enable Hubble metrics, a user now only has to specify which metrics should be enabled, e.g. `global.hubble.metrics.enabled='{drop,icmp}'` instead of providing both a list of metrics and the server port. In addition, the Helm values are made more consistent: `global.hubble.metricsServer` is changed to `global.hubble.metrics.port`. This mirrors the existing `global.prometheus.port` and simplifies the chart. Signed-off-by: Sebastian Wicki <sebastian@isovalent.com> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 05f8d34 ] The ipam option was moved from global to the ConfigMap so the scalability documentation needs to be updated. Fixes: c1a0025 ("doc: Fix require-ipv4-pod-cidr value for ENI and Azure mode") Signed-off-by: André Martins <andre@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit c54a76f ] The rule_translate_test.go was checking the output of an unsorted slice, which could occasionally fail with: FAIL: rule_translate_test.go:197: K8sSuite.TestGenerateToCIDRFromEndpoint rule_translate_test.go:228: c.Assert(string(rule.ToCIDRSet[0].Cidr), Equals, epIP1+"/32") ... obtained string = "10.1.1.2/32" ... expected string = "10.1.1.1/32" Fix it by implementing some basic sorting functions in the policy api package and using these in the offending tests. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 3c4d43a ] Previously if you manually edited the command in the backport summary file and referenced PRs elsewhere in the summary file, then the script would still ask if you wanted to update the labels for *all* PRs mentioned in the summary. This commit changes it to only ask whether you want to set the labels for the set of PRs that are listed in the *command* that's provided in the summary file. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 13d12df ] Hubble-relay image must be set in helm defaults for it to take effect. Signed-off-by: Jarno Rajahalme <jarno@covalent.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 805bbb9 ] These are achieved by `make -C install/kubernetes clean all`. Signed-off-by: Joe Stringer <joe@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit dc8e699 ] Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
[ upstream commit 615415b ] There is nothing nulti-node specific about this section. Rename it to just networking. Signed-off-by: Thomas Graf <thomas@cilium.io> Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
tklauser
added
backport/1.8
kind/backports
|
test-backport-1.8 |
joestringer
approved these changes
Jun 6, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sh -#11878 -- docs: k3s command missingsh -(@glibsm)Once this PR is merged, you can update the PR labels via: