Skip to content

fix: correctly handle multiple registries with the same Host #1063

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

Merged
merged 2 commits into from
Mar 3, 2025

Conversation

dkoshkin
Copy link
Contributor

@dkoshkin dkoshkin commented Mar 2, 2025

What problem does this PR solve?:
Write out a single CA file for multiple registries with the same url.Host. Return an error if the CA content for those registries do not match.

This fix is needed after another recent fix 17bc80d#diff-3b57926153158559026700fdb9392d259a62201d7eb485f3d0d62fdeaa976ffdL57-L64 that now correctly generates the CA files without the url.Path.

Which issue(s) this PR fixes:
Fixes #

How Has This Been Tested?:

New unit tests.

Special notes for your reviewer:

Write out a single CA file for multiple registries with the same url.Host.
Return an error if the CA content for those registries do not match.
@dkoshkin dkoshkin force-pushed the dkoshkin/fix-multiple-registries-CAs-same-host branch from 301c407 to a1b1224 Compare March 2, 2025 21:28
@dkoshkin
Copy link
Contributor Author

dkoshkin commented Mar 2, 2025

This fix will also need to be backported to release/v0.27.x

@github-actions github-actions bot added fix and removed fix labels Mar 2, 2025
@jimmidyson jimmidyson enabled auto-merge (squash) March 3, 2025 10:39
@jimmidyson jimmidyson requested a review from mhrabovcin March 3, 2025 10:39
@jimmidyson jimmidyson merged commit e88d493 into main Mar 3, 2025
21 checks passed
@jimmidyson jimmidyson deleted the dkoshkin/fix-multiple-registries-CAs-same-host branch March 3, 2025 11:08
jimmidyson added a commit that referenced this pull request Mar 3, 2025
**What problem does this PR solve?**:
Write out a single CA file for multiple registries with the same
url.Host. Return an error if the CA content for those registries do not
match.

This fix is needed after another recent fix
17bc80d#diff-3b57926153158559026700fdb9392d259a62201d7eb485f3d0d62fdeaa976ffdL57-L64
that now correctly generates the CA files without the url.Path.

**Which issue(s) this PR fixes**:
Fixes #

**How Has This Been Tested?**:
<!--
Please describe the tests that you ran to verify your changes.
Provide output from the tests and any manual steps needed to replicate
the tests.
-->
New unit tests.

**Special notes for your reviewer**:
<!--
Use this to provide any additional information to the reviewers.
This may include:
- Best way to review the PR.
- Where the author wants the most review attention on.
- etc.
-->

---------

Co-authored-by: Jimmi Dyson <[email protected]>
jimmidyson added a commit that referenced this pull request Mar 3, 2025
…t v0.27.x] (#1064)

**What problem does this PR solve?**:
Backport of #1063


**Which issue(s) this PR fixes**:
Fixes #

**How Has This Been Tested?**:
<!--
Please describe the tests that you ran to verify your changes.
Provide output from the tests and any manual steps needed to replicate
the tests.
-->

**Special notes for your reviewer**:
<!--
Use this to provide any additional information to the reviewers.
This may include:
- Best way to review the PR.
- Where the author wants the most review attention on.
- etc.
-->

Co-authored-by: Dimitri Koshkin <[email protected]>
faiq pushed a commit that referenced this pull request Apr 10, 2025
🤖 I have created a release *beep* *boop*
---


## 0.28.0 (2025-04-10)

<!-- Release notes generated using configuration in .github/release.yaml
at main -->

## What's Changed
### Exciting New Features 🎉
* feat: Update all addon versions by @jimmidyson in
#1054
* feat: go 1.24.1 and update all other tools by @jimmidyson in
#1066
* feat: bumped frr-routing to 9.1.3 by @ArvinderPal09 in
#1067
* feat: properly support kube-vip upgrades by @dkoshkin in
#1062
* feat: update addons by @dkoshkin in
#1072
* feat: enable Cilium's hubble relay mTLS by @dkoshkin in
#1086
* feat: adds image tempalting for capx by @faiq in
#1096
* feat: support setting kubeadm ignorePreflightErrors by @dkoshkin in
#1097
* feat: go 1.24.2 to fix CVE by @jimmidyson in
#1100
* feat: update Calico to v3.29.3 by @dkoshkin in
#1101
### Fixes 🔧
* fix: correctly handle multiple registries with the same Host by
@dkoshkin in
#1063
* fix: Tolerate all NoSchedule taints for NFD and CSI deployments by
@jimmidyson in
#1074
* fix: Retain existing join and init kubeadm config when adding taints
by @jimmidyson in
#1073
### Other Changes
* build: Update k8s versions for tests by @jimmidyson in
#1052
* docs: updates cilium doc with link to its default spec by
@manoj-nutanix in
#1036
* ci: Replace deprecated blackduck scan action by @jimmidyson in
#1070
* build: Update k8s.io/{kubelet,utils} deps by @jimmidyson in
#1078
* revert: "build: Update k8s.io/{kubelet,utils} deps" by @jimmidyson in
#1080
* ci: Enable dependabot for hack/tools module by @jimmidyson in
#1082
* build: Update k8s.io/kubelet dep by @jimmidyson in
#1081
* ci: Use Kubernetes minor in e2e check name by @jimmidyson in
#1090

## New Contributors
* @ArvinderPal09 made their first contribution in
#1067

**Full Changelog**:
v0.27.1...v0.28.0

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Dimitri Koshkin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants