Skip to content

CFP-25694: Move cilium/cilium-cli code into cilium/cilium repository#34178

Merged
michi-covalent merged 2644 commits intomainfrom
pr/michi/new-branch
Aug 16, 2024
Merged

CFP-25694: Move cilium/cilium-cli code into cilium/cilium repository#34178
michi-covalent merged 2644 commits intomainfrom
pr/michi/new-branch

Conversation

@michi-covalent
Copy link
Copy Markdown
Contributor

@michi-covalent michi-covalent commented Aug 5, 2024

most of commits are from cilium-cli repo. please review these commits:

8b4d060 - cilium-cli: Remove go.mod
4bd9e9b - Fix lint errors
55a6ded - Remove redundant files
bc6d709 - Update CODEOWNERS for cilium-cli/ directory
e497a37 - Build cilium-cli CI Docker image

ignore the following failures:

  • BPF Checks / Check Patch: it's complaining about commit message format. i'm not going to rewrite commit messages at this point.
  • Build Commits / Check if build works for every commit: too many commits to build before timing out.

Ref: cilium/design-cfps#9
Fixes #25694

@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 5, 2024
@michi-covalent michi-covalent added the release-note/ci This PR makes changes to the CI. label Aug 5, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 5, 2024
@michi-covalent michi-covalent temporarily deployed to release-base-images August 5, 2024 10:22 — with GitHub Actions Inactive
@michi-covalent michi-covalent temporarily deployed to release-base-images August 5, 2024 10:31 — with GitHub Actions Inactive
@michi-covalent
Copy link
Copy Markdown
Contributor Author

/test

@michi-covalent
Copy link
Copy Markdown
Contributor Author

/test

renovate bot and others added 23 commits August 16, 2024 10:58
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: renovate[bot] <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: renovate[bot] <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: Michi Mutsuzaki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

JUnit collector skip logic fixed.

Signed-off-by: viktor-kurchenko <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: Joe Stringer <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

This commit is to enable multicast status check and configuration from cilium-cli by adding multicast subcommand.
The list subcommand show the list of multicast groups or their subscribers on all nodes.
The add subcommand joins all nodes to the specified multicast group.
The del subcommand deletes the specified multicast group from all nodes.

This is follow up of cilium/cilium-cli#2574

Signed-off-by: Yusho Yamaguchi <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Also update kubeadm.k8s.io API version from v1beta2 to v1beta3.

Ref: #2720

Suggested-by: Joe Stringer <[email protected]>
Signed-off-by: Michi Mutsuzaki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: renovate[bot] <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: renovate[bot] <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Save all the condition functions from WithCondition() instead on only
remembering the one from the latest invocation. Run the test if and only
if it satisfies all the conditions.

Fixes: #2713

Signed-off-by: Michi Mutsuzaki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

in client-egress-l7-http-external-node CNP instead of the
fixed values to acconmodate the test namespace and external
deployment port change.

Signed-off-by: Yusuke Suzuki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: renovate[bot] <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: renovate[bot] <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

- Enable local-redirect-policy-with-node-dns.
- Disable local-redirect-policy until #2733 is fixed.

Signed-off-by: renovate[bot] <[email protected]>
Signed-off-by: Michi Mutsuzaki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Shorten cluster names to avoid getting this error:

    Error: Unable to install Cilium: execution error at (cilium/templates/validate.yaml:100:5):
    The cluster name is invalid: must not be more than 32 characters.
    Configure 'upgradeCompatibility' to 1.15 or earlier to temporarily
    skip this check at your own risk

Ref: #33939

Signed-off-by: Michi Mutsuzaki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Following the upgrade notes [^1]:

> With the default enablement of KVStoreMesh, if you use external
> workloads, ensure that your cluster has a Cluster name and ID
> specified before upgrading. Alternatively, you can explicitly opt out
> of KVStoreMesh.

[^1]: https://docs.cilium.io/en/stable/operations/upgrade/#upgrade-notes

Signed-off-by: Michi Mutsuzaki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: Michi Mutsuzaki <[email protected]>
[ cherry-picked from cilium/cilium-cli repository ]

Signed-off-by: Michi Mutsuzaki <[email protected]>
Remove go.mod from cilium-cli directory, and fix import paths to truly
unite cilium-cli with cilium repo.

Signed-off-by: Michi Mutsuzaki <[email protected]>
- Exclude cilium-cli in check-time.sh.
- Fix an indentation warning.

Signed-off-by: Michi Mutsuzaki <[email protected]>
These files will stay in cilium-cli repo for the time being.

Signed-off-by: Michi Mutsuzaki <[email protected]>
Build CI image for cilium-cli, and update all the workflows to use the
CI image instead of the image built from a release tag.

Signed-off-by: Michi Mutsuzaki <[email protected]>
@michi-covalent
Copy link
Copy Markdown
Contributor Author

/test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cilium-cli This PR contains changes related with cilium-cli cilium-cli-exclusive This PR only impacts cilium-cli binary release-note/ci This PR makes changes to the CI.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CFP: Move cilium/cilium-cli code into cilium/cilium repository