-
Notifications
You must be signed in to change notification settings - Fork 173
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
Change zarf init to always install the docker registry #82
Conversation
@@ -1,13 +1,13 @@ | |||
mirrors: | |||
registry.dso.mil: | |||
endpoint: | |||
- "https://zarf.localhost" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seen this behavior in some restricted environments too, so just removing for now because it doesn't really do anything for us. That, and it failed the E2E with the new mirroring setup:
https://repo1.dso.mil/platform-one/big-bang/apps/product-tools/zarf/-/jobs/7058776.
@jeff-mccoy in cli/internals/util/pki.go Change if ip := net.ParseIP(host); ip != nil {
template.IPAddresses = append(template.IPAddresses, ip)
} else {
// Add localhost to make things cleaner
template.DNSNames = append(template.DNSNames, host, "localhost", config.ZarfLocal, "*.localhost")
if template.Subject.CommonName == "" {
template.Subject.CommonName = host
}
} to // We need to add `config.ZarfLocal` to the certificate, but the way to do that is different depending on whether it
// is a DNS name or a IP address. This really shouldn't be necessary since `config.ZarfLocal` is a const, but it
// lets us mess with the value of that const without having to change logic in this function
if ip := net.ParseIP(config.ZarfLocal); ip != nil {
// config.ZarfLocal is an IP address
template.IPAddresses = append(template.IPAddresses, ip)
} else {
// config.ZarfLocal is assumed to be a DNS name
template.DNSNames = append(template.DNSNames, config.ZarfLocal)
}
if ip := net.ParseIP(host); ip != nil {
template.IPAddresses = append(template.IPAddresses, ip)
} else {
// Add localhost to make things cleaner
template.DNSNames = append(template.DNSNames, host, "localhost", "*.localhost")
if template.Subject.CommonName == "" {
template.Subject.CommonName = host
}
} I have this staged if you'd like me to push it, or you can adjust to your style if you want. |
Finally ugh, passing e2e: https://repo1.dso.mil/platform-one/big-bang/apps/product-tools/zarf/-/jobs/7102636 |
Edit: Nevermind, I forgot to |
That’s sounds like something I would do…. 😂 |
Other than the Repo1 comment LGTM |
Changes made and E2E passing: https://repo1.dso.mil/platform-one/big-bang/apps/product-tools/zarf/-/pipelines/515560 |
@jeff-mccoy can we delete this branch? |
No description provided.