Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v1.11] Backport of #18333 #18464

Merged
merged 3 commits into from
Jan 17, 2022

Conversation

christarazi
Copy link
Member

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

$ for pr in 18333; do contrib/backporting/set-labels.py $pr done 1.11; done

[ upstream commit fdf78f0 ]

It was not clear that the Curl*() helpers were expecting the first
parameter to be a format string (fmt.Sprintf()) if multiple parameters
are passed (for additional args to `curl`).

Signed-off-by: Chris Tarazi <chris@isovalent.com>
[ upstream commit e742f50 ]

This commit makes a few changes to the Policies suite which will be
useful in the subsequent commit.

* Extract common functions from Policies suite to be used outside of the
  Describe block
* Converge existing testCurlFromOutside() usage from the Services suite

Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi requested a review from a team as a code owner January 12, 2022 23:18
@christarazi christarazi added backport/1.11 This PR represents a backport for Cilium 1.11.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. labels Jan 12, 2022
@christarazi christarazi changed the title v1.11 backports 2022-01-12 [v1.11] Backport of #18333 Jan 12, 2022
@christarazi
Copy link
Member Author

/test-backport-1.11

[ upstream commit a6f9905 ]

[ Backporter's notes: The v1.11 tree doesn't have
                      helpers.GetFirstNodeWithoutCilium(), so the
                      conflict resolution was to use
                      helpers.GetNodeWithoutCilium(). ]

This test covers both cases where the kube-apiserver is within the
cluster or outside of the cluster.

This commit adds a second Describe block to the Policies, see comment on
top of the second Describe block for why.

Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi
Copy link
Member Author

/test-backport-1.11

@aditighag aditighag merged commit 6317ada into cilium:v1.11 Jan 17, 2022
@christarazi christarazi deleted the pr/v1.11-backport-2022-01-12 branch January 17, 2022 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.11 This PR represents a backport for Cilium 1.11.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants