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

Add Helm Clustermesh disconnect command #1739

Merged
merged 3 commits into from
Jun 23, 2023

Conversation

derailed
Copy link
Contributor

  • Surface new command to match cluster disconnect when CLI helm mode in enabled

Signed-off-by: Fernand Galiana fernand.galiana@isovalent.com

@derailed derailed temporarily deployed to ci June 20, 2023 15:59 — with GitHub Actions Inactive
@derailed derailed marked this pull request as ready for review June 20, 2023 17:21
@derailed derailed requested review from a team as code owners June 20, 2023 17:21
@michi-covalent michi-covalent added the priority/release-blocker This issue will prevent the release of the next version of Cilium. label Jun 20, 2023
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Show resolved Hide resolved
@derailed derailed temporarily deployed to ci June 20, 2023 18:18 — with GitHub Actions Inactive
@derailed derailed temporarily deployed to ci June 20, 2023 22:29 — with GitHub Actions Inactive
Copy link
Member

@asauber asauber left a comment

Choose a reason for hiding this comment

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

The current build failure indicates that the new semver logic is treating the Helm version under test (a 1.13.x version) not as classic mode.

Note that other recent runs of the test "Kind / helm-upgrade-clustermesh (pull_request)" show the log message ⚠️ Cilium Version is less than 1.14.0. Continuing in classic mode.

clustermesh/clustermesh.go Outdated Show resolved Hide resolved
@asauber
Copy link
Member

asauber commented Jun 21, 2023 via email

@asauber
Copy link
Member

asauber commented Jun 21, 2023 via email

Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

The current semver check does not seem to be correct, which is the cause for the tests failure. I'd also reverse the order of the commits, to reduce the churn.

.gitignore Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
internal/cli/cmd/clustermesh.go Outdated Show resolved Hide resolved
@derailed derailed temporarily deployed to ci June 21, 2023 14:13 — with GitHub Actions Inactive
@derailed derailed temporarily deployed to ci June 21, 2023 14:18 — with GitHub Actions Inactive
@derailed derailed temporarily deployed to ci June 21, 2023 14:43 — with GitHub Actions Inactive
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
Copy link
Member

@asauber asauber left a comment

Choose a reason for hiding this comment

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

Looking good, thanks for the additional tests and updates.

@derailed derailed temporarily deployed to ci June 21, 2023 18:10 — with GitHub Actions Inactive
@derailed derailed temporarily deployed to ci June 21, 2023 18:15 — with GitHub Actions Inactive
Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

The overall changes look good to me. I've left only a couple of minor cleanup comments and one question inline. I'd finally suggest to move the commit about 'needsClassicMode` first to reduce the churn and ensure that they all result in a working version.

clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
clustermesh/clustermesh_test.go Outdated Show resolved Hide resolved
clustermesh/clustermesh.go Outdated Show resolved Hide resolved
- Surface new command to match cluster disconnect when CLI helm mode in
  enabled

Signed-off-by: Fernand Galiana <fernand.galiana@isovalent.com>
- Add convenience to determine cilium version and check if classic mode
  should be enabled
- Updated connect/disconnect helm to use the new method

Signed-off-by: Fernand Galiana <fernand.galiana@isovalent.com>
- Exclude .envrc from repo

Signed-off-by: Fernand Galiana <fernand.galiana@isovalent.com>
@derailed derailed temporarily deployed to ci June 22, 2023 20:07 — with GitHub Actions Inactive
Copy link
Member

@giorio94 giorio94 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 to me, thanks!

@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 Jun 23, 2023
@tklauser tklauser merged commit 6ae94ce into cilium:main Jun 23, 2023
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/release-blocker This issue will prevent the release of the next version of Cilium. 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.

Implement cilium clustermesh disconnect for Helm mode
5 participants