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

antctl: fix cluster checker image #6565

Merged
merged 1 commit into from
Aug 2, 2024
Merged

Conversation

tnqn
Copy link
Member

@tnqn tnqn commented Jul 29, 2024

The image tag missed "v" when built for a released antctl.

The patch also makes test images configurable to support scenarios that hardcoded images are not accessible.

Fixes #6563

@tnqn tnqn added area/component/antctl Issues or PRs releated to the command line interface component action/backport Indicates a PR that requires backports. action/release-note Indicates a PR that should be included in release notes. labels Jul 29, 2024
@tnqn tnqn requested review from antoninbas, xliuxu and luolanzone July 29, 2024 03:46
xliuxu
xliuxu previously approved these changes Jul 29, 2024
Copy link
Contributor

@xliuxu xliuxu left a comment

Choose a reason for hiding this comment

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

LGTM

luolanzone
luolanzone previously approved these changes Jul 29, 2024
Copy link
Contributor

@luolanzone luolanzone left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -46,17 +46,21 @@ func Command() *cobra.Command {
}
command.Flags().StringVarP(&o.antreaNamespace, "namespace", "n", o.antreaNamespace, "Configure Namespace in which Antrea is running")
command.Flags().StringVar(&o.runFilter, "run", o.runFilter, "Run only the tests that match the provided regex")
command.Flags().StringVar(&o.testImage, "test-image", o.testImage, "Container image override for the installation checker")
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe this should be agnhost-image instead of test-image?
I find it less confusing this way as the tests clearly require that the /agnhost command be included in this image

Copy link
Member Author

@tnqn tnqn Jul 30, 2024

Choose a reason for hiding this comment

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

Do you suggest to rename the parameter for check cluster too? Currently it's also test-image, I'm not sure if antrea-agent-image is good.

Copy link
Contributor

Choose a reason for hiding this comment

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

I do have a preference for antrea-agent-image, but for that case we use the image more out of convenience. We could come up with an alternative Ubuntu-based image that would work just as well (as long as bash and modprobe are included. So we can keep the more generic name of test-image for check cluster if you prefer.

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you think we could publish an unified test image for both commands? I think agnhost will not be suffice in the future when we support validating wireguard, multicast etc. Then we would need to rename the parameter or provide test specific image parameters.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes we could publish a unified image. It would be good if we could use the toolbox image, assuming we don't grow the size too much.

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess I should split the patch into two: a one-line change for bugfix, another for unifying the image and providing a parameter to override the image.

The image tag missed "v" when built for a released antctl.

Signed-off-by: Quan Tian <quan.tian@broadcom.com>
@tnqn tnqn dismissed stale reviews from luolanzone and xliuxu via a4663e5 August 1, 2024 10:15
@tnqn tnqn force-pushed the fix-antctl-check-image branch from d82d876 to a4663e5 Compare August 1, 2024 10:15
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

LGTM
Please make sure the title is correct when you squash and merge

@tnqn tnqn changed the title antctl: fix cluster checker image and make it configurable antctl: fix cluster checker image Aug 2, 2024
@tnqn
Copy link
Member Author

tnqn commented Aug 2, 2024

/skip-all

1 similar comment
@tnqn
Copy link
Member Author

tnqn commented Aug 2, 2024

/skip-all

@tnqn tnqn merged commit c414b1c into antrea-io:main Aug 2, 2024
53 of 58 checks passed
@tnqn tnqn deleted the fix-antctl-check-image branch August 2, 2024 05:36
tnqn added a commit to tnqn/antrea that referenced this pull request Aug 5, 2024
The image tag missed "v" when built for a released antctl.

Signed-off-by: Quan Tian <quan.tian@broadcom.com>
tnqn added a commit that referenced this pull request Aug 5, 2024
The image tag missed "v" when built for a released antctl.

Signed-off-by: Quan Tian <quan.tian@broadcom.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
action/backport Indicates a PR that requires backports. action/release-note Indicates a PR that should be included in release notes. area/component/antctl Issues or PRs releated to the command line interface component
Projects
None yet
Development

Successfully merging this pull request may close these issues.

antctl check cluster tries to pull wrong tag
4 participants