-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #239 from squizzi/patch_support-non-oci-registry-t…
…ypes Add defaultRegistryURL and defaultRepoType for non-OCI HelmRepository support
- Loading branch information
Showing
8 changed files
with
130 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| image: | ||
| repository: hmc/controller | ||
| controller: | ||
| defaultOCIRegistry: oci://hmc-local-registry:5000/charts | ||
| defaultRegistryURL: oci://hmc-local-registry:5000/charts | ||
| insecureRegistry: true | ||
| createTemplates: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2024 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package utils | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/url" | ||
| ) | ||
|
|
||
| const ( | ||
| registryTypeOCI = "oci" | ||
| registryTypeDefault = "default" | ||
| ) | ||
|
|
||
| func DetermineDefaultRepositoryType(defaultRegistryURL string) (string, error) { | ||
| parsedRegistryURL, err := url.Parse(defaultRegistryURL) | ||
| if err != nil { | ||
| return "", fmt.Errorf("failed to parse default registry URL: %w", err) | ||
| } | ||
|
|
||
| switch parsedRegistryURL.Scheme { | ||
| case "oci": | ||
| return registryTypeOCI, nil | ||
| case "http", "https": | ||
| return registryTypeDefault, nil | ||
| default: | ||
| return "", fmt.Errorf("invalid default registry URL scheme: %s must be 'oci://', 'http://', or 'https://'", parsedRegistryURL.Scheme) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright 2024 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package utils | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestDetermineDefaultRepositoryType(t *testing.T) { | ||
| for _, tc := range []struct { | ||
| url string | ||
| expectErr bool | ||
| expectedScheme string | ||
| }{ | ||
| {url: "oci://hmc-local-registry:5000/charts", expectErr: false, expectedScheme: "oci"}, | ||
| {url: "https://registry.example.com", expectErr: false, expectedScheme: "default"}, | ||
| {url: "http://docker.io", expectErr: false, expectedScheme: "default"}, | ||
| {url: "ftp://ftp.example.com", expectErr: true}, | ||
| {url: "not-a-url", expectErr: true}, | ||
| } { | ||
| t.Run(tc.url, func(t *testing.T) { | ||
| actual, err := DetermineDefaultRepositoryType(tc.url) | ||
| if tc.expectErr && err == nil { | ||
| t.Errorf("expected error, got nil") | ||
| } | ||
| if !tc.expectErr && err != nil { | ||
| t.Errorf("unexpected error: %v", err) | ||
|
|
||
| if actual != tc.expectedScheme { | ||
| t.Errorf("expected scheme %q, got %q", tc.expectedScheme, actual) | ||
| } | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters