Skip to content

Commit ca43631

Browse files
committed
Remove deprecated APIs in group source.toolkit.fluxcd.io/v1beta1
Signed-off-by: Stefan Prodan <[email protected]>
1 parent c2b572b commit ca43631

13 files changed

+11
-1079
lines changed

api/v1beta1/bucket_types.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,7 @@ func (in *Bucket) GetInterval() metav1.Duration {
194194

195195
// +genclient
196196
// +kubebuilder:object:root=true
197-
// +kubebuilder:subresource:status
198-
// +kubebuilder:deprecatedversion:warning="v1beta1 Bucket is deprecated, upgrade to v1"
199-
// +kubebuilder:printcolumn:name="Endpoint",type=string,JSONPath=`.spec.endpoint`
200-
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
201-
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
202-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
197+
// +kubebuilder:skipversion
203198

204199
// Bucket is the Schema for the buckets API
205200
type Bucket struct {

api/v1beta1/doc.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ limitations under the License.
1515
*/
1616

1717
// Package v1beta1 contains API Schema definitions for the source v1beta1 API group
18+
//
19+
// Deprecated: v1beta1 is no longer supported, use v1 instead.
20+
//
1821
// +kubebuilder:object:generate=true
1922
// +groupName=source.toolkit.fluxcd.io
2023
package v1beta1

api/v1beta1/gitrepository_types.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,7 @@ func (in *GitRepository) GetInterval() metav1.Duration {
267267
// +genclient
268268
// +kubebuilder:object:root=true
269269
// +kubebuilder:resource:shortName=gitrepo
270-
// +kubebuilder:subresource:status
271-
// +kubebuilder:deprecatedversion:warning="v1beta1 GitRepository is deprecated, upgrade to v1"
272-
// +kubebuilder:printcolumn:name="URL",type=string,JSONPath=`.spec.url`
273-
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
274-
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
275-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
270+
// +kubebuilder:skipversion
276271

277272
// GitRepository is the Schema for the gitrepositories API
278273
type GitRepository struct {

api/v1beta1/helmchart_types.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,7 @@ func (in *HelmChart) GetValuesFiles() []string {
233233
// +genclient
234234
// +kubebuilder:object:root=true
235235
// +kubebuilder:resource:shortName=hc
236-
// +kubebuilder:subresource:status
237-
// +kubebuilder:deprecatedversion:warning="v1beta1 HelmChart is deprecated, upgrade to v1"
238-
// +kubebuilder:printcolumn:name="Chart",type=string,JSONPath=`.spec.chart`
239-
// +kubebuilder:printcolumn:name="Version",type=string,JSONPath=`.spec.version`
240-
// +kubebuilder:printcolumn:name="Source Kind",type=string,JSONPath=`.spec.sourceRef.kind`
241-
// +kubebuilder:printcolumn:name="Source Name",type=string,JSONPath=`.spec.sourceRef.name`
242-
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
243-
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
244-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
236+
// +kubebuilder:skipversion
245237

246238
// HelmChart is the Schema for the helmcharts API
247239
type HelmChart struct {

api/v1beta1/helmrepository_types.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,7 @@ func (in *HelmRepository) GetInterval() metav1.Duration {
183183
// +genclient
184184
// +kubebuilder:object:root=true
185185
// +kubebuilder:resource:shortName=helmrepo
186-
// +kubebuilder:subresource:status
187-
// +kubebuilder:deprecatedversion:warning="v1beta1 HelmRepository is deprecated, upgrade to v1"
188-
// +kubebuilder:printcolumn:name="URL",type=string,JSONPath=`.spec.url`
189-
// +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].status",description=""
190-
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[?(@.type==\"Ready\")].message",description=""
191-
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description=""
186+
// +kubebuilder:skipversion
192187

193188
// HelmRepository is the Schema for the helmrepositories API
194189
type HelmRepository struct {

config/crd/bases/source.toolkit.fluxcd.io_buckets.yaml

Lines changed: 0 additions & 232 deletions
Original file line numberDiff line numberDiff line change
@@ -367,238 +367,6 @@ spec:
367367
storage: true
368368
subresources:
369369
status: {}
370-
- additionalPrinterColumns:
371-
- jsonPath: .spec.endpoint
372-
name: Endpoint
373-
type: string
374-
- jsonPath: .status.conditions[?(@.type=="Ready")].status
375-
name: Ready
376-
type: string
377-
- jsonPath: .status.conditions[?(@.type=="Ready")].message
378-
name: Status
379-
type: string
380-
- jsonPath: .metadata.creationTimestamp
381-
name: Age
382-
type: date
383-
deprecated: true
384-
deprecationWarning: v1beta1 Bucket is deprecated, upgrade to v1
385-
name: v1beta1
386-
schema:
387-
openAPIV3Schema:
388-
description: Bucket is the Schema for the buckets API
389-
properties:
390-
apiVersion:
391-
description: |-
392-
APIVersion defines the versioned schema of this representation of an object.
393-
Servers should convert recognized schemas to the latest internal value, and
394-
may reject unrecognized values.
395-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
396-
type: string
397-
kind:
398-
description: |-
399-
Kind is a string value representing the REST resource this object represents.
400-
Servers may infer this from the endpoint the client submits requests to.
401-
Cannot be updated.
402-
In CamelCase.
403-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
404-
type: string
405-
metadata:
406-
type: object
407-
spec:
408-
description: BucketSpec defines the desired state of an S3 compatible
409-
bucket
410-
properties:
411-
accessFrom:
412-
description: AccessFrom defines an Access Control List for allowing
413-
cross-namespace references to this object.
414-
properties:
415-
namespaceSelectors:
416-
description: |-
417-
NamespaceSelectors is the list of namespace selectors to which this ACL applies.
418-
Items in this list are evaluated using a logical OR operation.
419-
items:
420-
description: |-
421-
NamespaceSelector selects the namespaces to which this ACL applies.
422-
An empty map of MatchLabels matches all namespaces in a cluster.
423-
properties:
424-
matchLabels:
425-
additionalProperties:
426-
type: string
427-
description: |-
428-
MatchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels
429-
map is equivalent to an element of matchExpressions, whose key field is "key", the
430-
operator is "In", and the values array contains only "value". The requirements are ANDed.
431-
type: object
432-
type: object
433-
type: array
434-
required:
435-
- namespaceSelectors
436-
type: object
437-
bucketName:
438-
description: The bucket name.
439-
type: string
440-
endpoint:
441-
description: The bucket endpoint address.
442-
type: string
443-
ignore:
444-
description: |-
445-
Ignore overrides the set of excluded patterns in the .sourceignore format
446-
(which is the same as .gitignore). If not provided, a default will be used,
447-
consult the documentation for your version to find out what those are.
448-
type: string
449-
insecure:
450-
description: Insecure allows connecting to a non-TLS S3 HTTP endpoint.
451-
type: boolean
452-
interval:
453-
description: The interval at which to check for bucket updates.
454-
type: string
455-
provider:
456-
default: generic
457-
description: The S3 compatible storage provider name, default ('generic').
458-
enum:
459-
- generic
460-
- aws
461-
- gcp
462-
type: string
463-
region:
464-
description: The bucket region.
465-
type: string
466-
secretRef:
467-
description: |-
468-
The name of the secret containing authentication credentials
469-
for the Bucket.
470-
properties:
471-
name:
472-
description: Name of the referent.
473-
type: string
474-
required:
475-
- name
476-
type: object
477-
suspend:
478-
description: This flag tells the controller to suspend the reconciliation
479-
of this source.
480-
type: boolean
481-
timeout:
482-
default: 60s
483-
description: The timeout for download operations, defaults to 60s.
484-
type: string
485-
required:
486-
- bucketName
487-
- endpoint
488-
- interval
489-
type: object
490-
status:
491-
default:
492-
observedGeneration: -1
493-
description: BucketStatus defines the observed state of a bucket
494-
properties:
495-
artifact:
496-
description: Artifact represents the output of the last successful
497-
Bucket sync.
498-
properties:
499-
checksum:
500-
description: Checksum is the SHA256 checksum of the artifact.
501-
type: string
502-
lastUpdateTime:
503-
description: |-
504-
LastUpdateTime is the timestamp corresponding to the last update of this
505-
artifact.
506-
format: date-time
507-
type: string
508-
path:
509-
description: Path is the relative file path of this artifact.
510-
type: string
511-
revision:
512-
description: |-
513-
Revision is a human readable identifier traceable in the origin source
514-
system. It can be a Git commit SHA, Git tag, a Helm index timestamp, a Helm
515-
chart version, etc.
516-
type: string
517-
url:
518-
description: URL is the HTTP address of this artifact.
519-
type: string
520-
required:
521-
- lastUpdateTime
522-
- path
523-
- url
524-
type: object
525-
conditions:
526-
description: Conditions holds the conditions for the Bucket.
527-
items:
528-
description: Condition contains details for one aspect of the current
529-
state of this API Resource.
530-
properties:
531-
lastTransitionTime:
532-
description: |-
533-
lastTransitionTime is the last time the condition transitioned from one status to another.
534-
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
535-
format: date-time
536-
type: string
537-
message:
538-
description: |-
539-
message is a human readable message indicating details about the transition.
540-
This may be an empty string.
541-
maxLength: 32768
542-
type: string
543-
observedGeneration:
544-
description: |-
545-
observedGeneration represents the .metadata.generation that the condition was set based upon.
546-
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
547-
with respect to the current state of the instance.
548-
format: int64
549-
minimum: 0
550-
type: integer
551-
reason:
552-
description: |-
553-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
554-
Producers of specific condition types may define expected values and meanings for this field,
555-
and whether the values are considered a guaranteed API.
556-
The value should be a CamelCase string.
557-
This field may not be empty.
558-
maxLength: 1024
559-
minLength: 1
560-
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
561-
type: string
562-
status:
563-
description: status of the condition, one of True, False, Unknown.
564-
enum:
565-
- "True"
566-
- "False"
567-
- Unknown
568-
type: string
569-
type:
570-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
571-
maxLength: 316
572-
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
573-
type: string
574-
required:
575-
- lastTransitionTime
576-
- message
577-
- reason
578-
- status
579-
- type
580-
type: object
581-
type: array
582-
lastHandledReconcileAt:
583-
description: |-
584-
LastHandledReconcileAt holds the value of the most recent
585-
reconcile request value, so a change of the annotation value
586-
can be detected.
587-
type: string
588-
observedGeneration:
589-
description: ObservedGeneration is the last observed generation.
590-
format: int64
591-
type: integer
592-
url:
593-
description: URL is the download link for the artifact output of the
594-
last Bucket sync.
595-
type: string
596-
type: object
597-
type: object
598-
served: true
599-
storage: false
600-
subresources:
601-
status: {}
602370
- additionalPrinterColumns:
603371
- jsonPath: .spec.endpoint
604372
name: Endpoint

0 commit comments

Comments
 (0)