Skip to content

Commit d918b5a

Browse files
hossainemruzhossainemruz
authored
Upate HelmRepository to v1 and HelmRelease to v2 (#115)
1 parent a6267b2 commit d918b5a

File tree

4 files changed

+54
-262
lines changed

4 files changed

+54
-262
lines changed

‎api/v1/region_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package v1
22

33
import (
4-
helmapi "github.com/fluxcd/helm-controller/api/v2beta2"
5-
srcapi "github.com/fluxcd/source-controller/api/v1beta2"
4+
helmapiv2 "github.com/fluxcd/helm-controller/api/v2"
5+
srcapiv1 "github.com/fluxcd/source-controller/api/v1"
66
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
77
)
88

@@ -49,7 +49,7 @@ type HelmRepository struct {
4949
MarkedForDeletionAt *string `json:"markedForDeletionAt,omitempty"`
5050
// Object specifies the helm repository object
5151
// +kubebuilder:validation:EmbeddedResource
52-
Object *srcapi.HelmRepository `json:"object,omitempty"`
52+
Object *srcapiv1.HelmRepository `json:"object,omitempty"`
5353
}
5454

5555
type HelmRelease struct {
@@ -58,7 +58,7 @@ type HelmRelease struct {
5858
MarkedForDeletionAt *string `json:"markedForDeletionAt,omitempty"`
5959
// Object specifies the helm release object
6060
// +kubebuilder:validation:EmbeddedResource
61-
Object *helmapi.HelmRelease `json:"object,omitempty"`
61+
Object *helmapiv2.HelmRelease `json:"object,omitempty"`
6262
}
6363

6464
type RegionPhase string

‎api/v1/zz_generated.deepcopy.go‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎charts/qdrant-kubernetes-api/templates/region-crds/qdrant.io_qdrantcloudregions.yaml‎

Lines changed: 23 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ spec:
118118
properties:
119119
chart:
120120
description: |-
121-
Chart defines the template of the v1beta2.HelmChart that should be created
121+
Chart defines the template of the v1.HelmChart that should be created
122122
for this HelmRelease.
123123
properties:
124124
metadata:
@@ -144,7 +144,7 @@ spec:
144144
type: object
145145
type: object
146146
spec:
147-
description: Spec holds the template for the v1beta2.HelmChartSpec
147+
description: Spec holds the template for the v1.HelmChartSpec
148148
for this HelmRelease.
149149
properties:
150150
chart:
@@ -203,13 +203,6 @@ spec:
203203
- kind
204204
- name
205205
type: object
206-
valuesFile:
207-
description: |-
208-
Alternative values file to use as the default chart values, expected to
209-
be a relative path in the SourceRef. Deprecated in favor of ValuesFiles,
210-
for backwards compatibility the file defined here is merged before the
211-
ValuesFiles items. Ignored when omitted.
212-
type: string
213206
valuesFiles:
214207
description: |-
215208
Alternative list of values files to use as the chart values (values.yaml
@@ -253,7 +246,7 @@ spec:
253246
version:
254247
default: '*'
255248
description: |-
256-
Version semver expression, ignored for charts from v1beta2.GitRepository and
249+
Version semver expression, ignored for charts from v1.GitRepository and
257250
v1beta2.Bucket sources. Defaults to latest when omitted.
258251
type: string
259252
required:
@@ -267,9 +260,6 @@ spec:
267260
description: |-
268261
ChartRef holds a reference to a source controller resource containing the
269262
Helm chart artifact.
270-
271-
Note: this field is provisional to the v2 API, and not actively used
272-
by v2beta2 HelmReleases.
273263
properties:
274264
apiVersion:
275265
description: APIVersion of the referent.
@@ -442,6 +432,16 @@ spec:
442432
DisableOpenAPIValidation prevents the Helm install action from validating
443433
rendered templates against the Kubernetes OpenAPI Schema.
444434
type: boolean
435+
disableSchemaValidation:
436+
description: |-
437+
DisableSchemaValidation prevents the Helm install action from validating
438+
the values against the JSON Schema.
439+
type: boolean
440+
disableTakeOwnership:
441+
description: |-
442+
DisableTakeOwnership disables taking ownership of existing resources
443+
during the Helm install action. Defaults to false.
444+
type: boolean
445445
disableWait:
446446
description: |-
447447
DisableWait disables the waiting for resources to be ready after a Helm
@@ -659,114 +659,6 @@ spec:
659659
- patch
660660
type: object
661661
type: array
662-
patchesJson6902:
663-
description: |-
664-
JSON 6902 patches, defined as inline YAML objects.
665-
Deprecated: use Patches instead.
666-
items:
667-
description: JSON6902Patch contains a JSON6902
668-
patch and the target the patch should
669-
be applied to.
670-
properties:
671-
patch:
672-
description: Patch contains the JSON6902
673-
patch document with an array of operation
674-
objects.
675-
items:
676-
description: |-
677-
JSON6902 is a JSON6902 operation object.
678-
https://datatracker.ietf.org/doc/html/rfc6902#section-4
679-
properties:
680-
from:
681-
description: |-
682-
From contains a JSON-pointer value that references a location within the target document where the operation is
683-
performed. The meaning of the value depends on the value of Op, and is NOT taken into account by all operations.
684-
type: string
685-
op:
686-
description: |-
687-
Op indicates the operation to perform. Its value MUST be one of "add", "remove", "replace", "move", "copy", or
688-
"test".
689-
https://datatracker.ietf.org/doc/html/rfc6902#section-4
690-
enum:
691-
- test
692-
- remove
693-
- add
694-
- replace
695-
- move
696-
- copy
697-
type: string
698-
path:
699-
description: |-
700-
Path contains the JSON-pointer value that references a location within the target document where the operation
701-
is performed. The meaning of the value depends on the value of Op.
702-
type: string
703-
value:
704-
description: |-
705-
Value contains a valid JSON structure. The meaning of the value depends on the value of Op, and is NOT taken into
706-
account by all operations.
707-
x-kubernetes-preserve-unknown-fields: true
708-
required:
709-
- op
710-
- path
711-
type: object
712-
type: array
713-
target:
714-
description: Target points to the resources
715-
that the patch document should be
716-
applied to.
717-
properties:
718-
annotationSelector:
719-
description: |-
720-
AnnotationSelector is a string that follows the label selection expression
721-
https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
722-
It matches with the resource annotations.
723-
type: string
724-
group:
725-
description: |-
726-
Group is the API group to select resources from.
727-
Together with Version and Kind it is capable of unambiguously identifying and/or selecting resources.
728-
https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
729-
type: string
730-
kind:
731-
description: |-
732-
Kind of the API Group to select resources from.
733-
Together with Group and Version it is capable of unambiguously
734-
identifying and/or selecting resources.
735-
https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
736-
type: string
737-
labelSelector:
738-
description: |-
739-
LabelSelector is a string that follows the label selection expression
740-
https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
741-
It matches with the resource labels.
742-
type: string
743-
name:
744-
description: Name to match resources
745-
with.
746-
type: string
747-
namespace:
748-
description: Namespace to select
749-
resources from.
750-
type: string
751-
version:
752-
description: |-
753-
Version of the API Group to select resources from.
754-
Together with Group and Kind it is capable of unambiguously identifying and/or selecting resources.
755-
https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
756-
type: string
757-
type: object
758-
required:
759-
- patch
760-
- target
761-
type: object
762-
type: array
763-
patchesStrategicMerge:
764-
description: |-
765-
Strategic merge patches, defined as inline YAML objects.
766-
Deprecated: use Patches instead.
767-
items:
768-
x-kubernetes-preserve-unknown-fields: true
769-
type: array
770662
type: object
771663
type: object
772664
type: array
@@ -966,6 +858,16 @@ spec:
966858
DisableOpenAPIValidation prevents the Helm upgrade action from validating
967859
rendered templates against the Kubernetes OpenAPI Schema.
968860
type: boolean
861+
disableSchemaValidation:
862+
description: |-
863+
DisableSchemaValidation prevents the Helm upgrade action from validating
864+
the values against the JSON Schema.
865+
type: boolean
866+
disableTakeOwnership:
867+
description: |-
868+
DisableTakeOwnership disables taking ownership of existing resources
869+
during the Helm upgrade action. Defaults to false.
870+
type: boolean
969871
disableWait:
970872
description: |-
971873
DisableWait disables the waiting for resources to be ready after a Helm
@@ -1276,12 +1178,6 @@ spec:
12761178
state. It is reset after a successful reconciliation.
12771179
format: int64
12781180
type: integer
1279-
lastAppliedRevision:
1280-
description: |-
1281-
LastAppliedRevision is the revision of the last successfully applied
1282-
source.
1283-
Deprecated: the revision can now be found in the History.
1284-
type: string
12851181
lastAttemptedConfigDigest:
12861182
description: |-
12871183
LastAttemptedConfigDigest is the digest for the config (better known as

0 commit comments

Comments
 (0)