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

#18554 v1.10 backport #18617

Merged
merged 2 commits into from Jan 27, 2022
Merged

#18554 v1.10 backport #18617

merged 2 commits into from Jan 27, 2022

Conversation

jibi
Copy link
Member

@jibi jibi commented Jan 25, 2022

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

$ for pr in 18554; do contrib/backporting/set-labels.py $pr done 1.10; done

@jibi jibi added kind/backports This PR provides functionality previously merged into master. backport/1.10 labels Jan 25, 2022
@jibi jibi requested a review from nbusseneau January 25, 2022 17:46
@jibi jibi requested review from a team as code owners January 25, 2022 17:46
@jibi
Copy link
Member Author

jibi commented Jan 25, 2022

/test-backport-1.10

@@ -4,6 +4,7 @@ on:
pull_request:
branches:
- v1.10
- ft/v1.10/**
push:
branches:
- v1.10
Copy link
Contributor

Choose a reason for hiding this comment

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

@jibi 👋 I'm going over the v1.11 backport of the same patch, and was wondering whether we need to add a line under branches here as well?

i.e.,

    branches:
        - v1.10
        - ft/v1.10/**

in the case of 1.10.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, for v1.11 we'll need to change that to ft/v1.11/**

[ upstream commit c7d9836 ]

This commit enables CI for all feature branches based on the v1.10 one.

The naming convention for the base feature branch is:

  ft/v1.10/<feature>

Signed-off-by: Gilberto Bertin <gilberto@isovalent.com>
@jibi jibi force-pushed the pr/jibi/1.10-backport-18554 branch from 70d7802 to ba16997 Compare January 26, 2022 10:13
#. Fork the Cilium repository to your GitHub user or organization.
#. Turn off GitHub actions for your fork as described in the `GitHub Docs <https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository#managing-github-actions-permissions-for-your-repository>`_.
#. This is recommended to avoid unnecessary CI notification failures on the fork.
#. Clone your ``${YOUR_GITHUB_USERNAME_OR_ORG}/cilium`` fork into your ``GOPATH``, and setup the base repository as ``upstream`` remote:
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure we should update the documentation for the backports 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, on a second thought I should probably not. Let me get rid of it

[ upstream commit cc85af8 ]

Currently CI will run only on the base cilium/cilium repo, due to a
check in most workflows in the form of:

    if: ${{ github.repository == 'cilium/cilium' }}

The original intent of this check was to avoid running CI on forks,
since workflow secrets are usually not configured, resulting in multiple
failures.

It turned out that the ability to run CI on forks is something useful to
have, and as a bonus point it would ease the development and maintenance
of new and existing workflows.

Because of this, this commit removes the aforementioned check.

Signed-off-by: Gilberto Bertin <gilberto@isovalent.com>
@jibi jibi force-pushed the pr/jibi/1.10-backport-18554 branch from ba16997 to 9383263 Compare January 26, 2022 12:50
@jibi
Copy link
Member Author

jibi commented Jan 26, 2022

/test-backport-1.10

Job 'Cilium-PR-K8s-GKE' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sKafkaPolicyTest Kafka Policy Tests KafkaPolicies

Failure Output

FAIL: Kafka Pods are not ready after timeout

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-GKE so I can create a new GitHub issue to track it.

Job 'Cilium-PR-K8s-1.17-kernel-4.9' failed and has not been observed before, so may be related to your PR:

Click to show.

Test Name

K8sConformance Portmap Chaining Check connectivity-check compliance with portmap chaining

Failure Output

FAIL: connectivity-check pods are not ready after timeout

If it is a flake, comment /mlh new-flake Cilium-PR-K8s-1.17-kernel-4.9 so I can create a new GitHub issue to track it.

@jibi
Copy link
Member Author

jibi commented Jan 26, 2022

Couple of unrelated flakes, marking as ready to merge

@jibi jibi added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 26, 2022
@glibsm glibsm merged commit c985f58 into v1.10 Jan 27, 2022
@glibsm glibsm deleted the pr/jibi/1.10-backport-18554 branch January 27, 2022 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants