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.12 Backports 2023-12-13 #29842

Merged
merged 2 commits into from
Dec 13, 2023
Merged

v1.12 Backports 2023-12-13 #29842

merged 2 commits into from
Dec 13, 2023

Conversation

giorio94
Copy link
Member

@giorio94 giorio94 commented Dec 13, 2023

Once this PR is merged, a GitHub action will update the labels of these PRs:

 29694 29675

mhofstetter and others added 2 commits December 13, 2023 10:34
[ upstream commit 1f1c384 ]

[ backporter's notes: skipped changes in conformance-aks.yaml, as
  that workflow is not present in v1.12. ]

Cloud provider related workflows use the full configuration as matrix
when being executed on a scheduled basis on stable branches, whereas
only the default configuration is used on PR workflows.

Currently, this decision checks whether the workflow is triggered
via `event_name == schedule`.

This is working fine on `main`, but not on all other stable branches
where the workflows are triggered via workflow_dispatch event (called
by a scheduled workflow (ariane-scheduled.yaml) on main).

Therefore, this commit extends the decision to check for the input `PR-number`
starting with a "v". This is the case for Ariane triggered runs - as they pass
the branch name as PR-number (PR runs pass the actual numeric PR number).

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit dbe56dd ]

Now that known issues causing connection disruption (which appeared to
mostly affect dual stack clusters) have been fixed, let's enable IPv6
again in the clustermesh upgrade/downgrade workflow.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@giorio94 giorio94 added kind/backports This PR provides functionality previously merged into master. backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. labels Dec 13, 2023
@giorio94
Copy link
Member Author

/test-backport-1.12

@giorio94 giorio94 marked this pull request as ready for review December 13, 2023 09:45
@giorio94 giorio94 requested review from a team as code owners December 13, 2023 09:45
@qmonnet
Copy link
Member

qmonnet commented Dec 13, 2023

Ideally, ci/ipsec: Skip waiting for images when skipping upgrade/dowgrade should go in after #29514 has been backported (so that we can add the if to the other step as well). I see this other PR was marked as backport/author, maybe we should take the commit out of this PR and label #29793 as well.

@giorio94
Copy link
Member Author

Ideally, ci/ipsec: Skip waiting for images when skipping upgrade/dowgrade should go in after #29514 has been backported (so that we can add the if to the other step as well). I see this other PR was marked as backport/author, maybe we should take the commit out of this PR and label #29793 as well.

Makes sense to me, I'll drop it from here, and mark the PR as backport/author for the moment.

@giorio94
Copy link
Member Author

/test-backport-1.12

@qmonnet qmonnet removed their request for review December 13, 2023 10:19
Copy link
Member

@mhofstetter mhofstetter left a comment

Choose a reason for hiding this comment

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

My commit looks good. Thanks @giorio94

@giorio94
Copy link
Member Author

/test-1.21-4.9

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Dec 13, 2023
@ldelossa ldelossa merged commit 1534fa7 into v1.12 Dec 13, 2023
106 checks passed
@ldelossa ldelossa deleted the pr/v1.12-backport-2023-12-13 branch December 13, 2023 16:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. 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
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

None yet

5 participants