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

fixing the makefile; enforcing the registry port match; #1550

Merged
merged 4 commits into from
Feb 12, 2025

Conversation

yakom
Copy link
Contributor

@yakom yakom commented Feb 4, 2025

makefile changes make sure that the vendor directory is used by the build process (the GOFLAGS change) as well as that the local cache isn't needlessly built (both changes) - since there is the said directory.

the code changes fix issue 1406, making sure that the internal and external listening ports of the registries match if they are set to a non-default value (and that the Docker port mapping of the registry container is set up correctly as well).


when i run the E2E tests locally, 8 of them are failing for a seemingly unrelated reason. i'd like to be able to see the CI test execution output.

@iwilltry42 iwilltry42 self-requested a review February 12, 2025 09:46
Copy link
Member

@iwilltry42 iwilltry42 left a comment

Choose a reason for hiding this comment

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

Just one question, otherwise LGTM

@@ -83,7 +91,7 @@ func ParsePortExposureSpec(exposedPortSpec, internalPort string) (*k3d.ExposureO
}

// port: get a free one if there's none defined or set to random
if submatches["port"] == "" || submatches["port"] == "random" {
Copy link
Member

Choose a reason for hiding this comment

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

Why remove the empty case?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

because it's dead code, that case is already handled in the line 50.

Copy link
Member

Choose a reason for hiding this comment

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

Fair - didn't see that in the reduced PR view 👍

@@ -83,7 +91,7 @@ func ParsePortExposureSpec(exposedPortSpec, internalPort string) (*k3d.ExposureO
}

// port: get a free one if there's none defined or set to random
if submatches["port"] == "" || submatches["port"] == "random" {
Copy link
Member

Choose a reason for hiding this comment

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

Fair - didn't see that in the reduced PR view 👍

@iwilltry42 iwilltry42 merged commit c569517 into k3d-io:main Feb 12, 2025
3 checks passed
@iwilltry42
Copy link
Member

Thanks for this enhancement!

@cowwoc
Copy link

cowwoc commented Feb 13, 2025

@yakom @iwilltry42 I suspect that this change broke ligfx/k3d-registry-dockerd#13 (comment). Can you please take a quick look?

@iwilltry42
Copy link
Member

FYI: I reverted this and pushed v5.8.3 - we'll re-introduce this change (maybe slightly adjusted) including more docs and more verbose release notes again at a later time.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] k3d-managed registry with non-5000 port not accessible from within the cluster
4 participants