Skip to content

v1.7 backports 2021-04-19 #15767

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Apr 20, 2021
Merged

v1.7 backports 2021-04-19 #15767

merged 2 commits into from
Apr 20, 2021

Conversation

jibi
Copy link
Member

@jibi jibi commented Apr 19, 2021

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

$ for pr in 15118 15668; do contrib/backporting/set-labels.py $pr done 1.7; done

aditighag and others added 2 commits April 19, 2021 14:05
@aditighag @jibi
backporting: Update instructions for backporting workflow
2d6b596 
[ upstream commit 198fe64 ]

Commit 02320e added support for working with Cilium forks. Document the
additional steps that are required with this new workflow.

Additionally, workflow scope might be needed with the GitHub token in
some cases that update the corresponding yamls -

``(refusing to allow a Personal Access Token to create or update workflow `.github/workflows/go-check.yaml` without `workflow` scope``

Signed-off-by: Aditi Ghag <aditi@cilium.io>
Signed-off-by: Gilberto Bertin <gilberto@isovalent.com>
@jomenxiao @jibi
fix chan panic
e3ac11f 
[ upstream commit 4a8f407 ]

Signed-off-by: jomenxiao <jomenxiao@gmail.com>
Signed-off-by: Gilberto Bertin <gilberto@isovalent.com>
@jibi jibi requested a review from a team as a code owner April 19, 2021 12:07
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Apr 19, 2021
aanm
aanm approved these changes Apr 19, 2021
View reviewed changes
Copy link
Member

@aanm aanm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good for #15668

@jibi
Copy link
Member Author

jibi commented Apr 19, 2021

test-backport-1.7

@joestringer
Copy link
Member

Hit known flakes #12735 (https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-Validated/20101/testReport/junit/Suite-k8s-1/11/K8sDatapathConfig_Encapsulation_Check_connectivity_with_sockops_and_VXLAN_encapsulation/), #8775 (https://jenkins.cilium.io/job/Cilium-PR-Ginkgo-Tests-K8s/4023/testReport/junit/Suite-k8s-1/14/K8sIstioTest_Istio_Bookinfo_Demo_Tests_bookinfo_inter_service_connectivity/). Unlikely to represent regressions in the branch.

@joestringer joestringer merged commit fc95564 into v1.7 Apr 20, 2021
@joestringer joestringer deleted the pr/v1.7-backport-2021-04-19 branch April 20, 2021 21:28
@joestringer joestringer mentioned this pull request Apr 20, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanm aanm aanm approved these changes

Assignees
No one assigned
Labels
kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jibi @joestringer @aanm @aditighag @jomenxiao