diff --git a/api/v1beta1/helmrepository_types.go b/api/v1beta1/helmrepository_types.go index bb88e9efb..3c87fc9bf 100644 --- a/api/v1beta1/helmrepository_types.go +++ b/api/v1beta1/helmrepository_types.go @@ -74,7 +74,7 @@ type HelmRepositorySpec struct { AccessFrom *acl.AccessFrom `json:"accessFrom,omitempty"` // Type of the HelmRepository. - // When this field is set to "OCI", the URL field value must be prefixed with "oci://". + // When this field is set to "oci", the URL field value must be prefixed with "oci://". // +kubebuilder:validation:Enum=default;oci // +optional Type string `json:"type,omitempty"` diff --git a/api/v1beta2/helmrepository_types.go b/api/v1beta2/helmrepository_types.go index 92e9d74ea..405670579 100644 --- a/api/v1beta2/helmrepository_types.go +++ b/api/v1beta2/helmrepository_types.go @@ -83,7 +83,7 @@ type HelmRepositorySpec struct { AccessFrom *acl.AccessFrom `json:"accessFrom,omitempty"` // Type of the HelmRepository. - // When this field is set to "OCI", the URL field value must be prefixed with "oci://". + // When this field is set to "oci", the URL field value must be prefixed with "oci://". // +kubebuilder:validation:Enum=default;oci // +optional Type string `json:"type,omitempty"` diff --git a/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml b/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml index bb4e77e17..960619d9c 100644 --- a/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml +++ b/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml @@ -110,7 +110,7 @@ spec: description: The timeout of index downloading, defaults to 60s. type: string type: - description: Type of the HelmRepository. When this field is set to "OCI", + description: Type of the HelmRepository. When this field is set to "oci", the URL field value must be prefixed with "oci://". enum: - default @@ -338,7 +338,7 @@ spec: description: Timeout of the index fetch operation, defaults to 60s. type: string type: - description: Type of the HelmRepository. When this field is set to "OCI", + description: Type of the HelmRepository. When this field is set to "oci", the URL field value must be prefixed with "oci://". enum: - default diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b82855594..50a20333c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -6,4 +6,4 @@ resources: images: - name: fluxcd/source-controller newName: fluxcd/source-controller - newTag: v0.24.4 + newTag: latest diff --git a/controllers/helmrepository_controller_oci_test.go b/controllers/helmrepository_controller_oci_test.go index 82fe56de3..6069fe8ca 100644 --- a/controllers/helmrepository_controller_oci_test.go +++ b/controllers/helmrepository_controller_oci_test.go @@ -1,9 +1,12 @@ /* Copyright 2022 The Flux authors + 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. diff --git a/controllers/helmrepository_predicate.go b/controllers/helmrepository_predicate.go index b8c1c9709..3fee01e0c 100644 --- a/controllers/helmrepository_predicate.go +++ b/controllers/helmrepository_predicate.go @@ -1,3 +1,19 @@ +/* +Copyright 2022 The Flux authors + +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 controllers import ( diff --git a/docs/api/source.md b/docs/api/source.md index 68ca66062..f10fd0019 100644 --- a/docs/api/source.md +++ b/docs/api/source.md @@ -858,7 +858,7 @@ string (Optional)

Type of the HelmRepository. -When this field is set to “OCI”, the URL field value must be prefixed with “oci://”.

+When this field is set to “oci”, the URL field value must be prefixed with “oci://”.

@@ -2116,7 +2116,7 @@ string (Optional)

Type of the HelmRepository. -When this field is set to “OCI”, the URL field value must be prefixed with “oci://”.

+When this field is set to “oci”, the URL field value must be prefixed with “oci://”.