Skip to content

Commit 8c21b03

Browse files
committed
Remove deprecated APIs in group image.toolkit.fluxcd.io/v1beta1
Signed-off-by: Stefan Prodan <[email protected]>
1 parent 3bff81a commit 8c21b03

File tree

4 files changed

+5
-352
lines changed

4 files changed

+5
-352
lines changed

api/v1beta1/doc.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,9 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// Package v1beta1 contains API types for the image API group, version
18-
// v1beta1. The types here are concerned with automated updates to
19-
// git, based on metadata from OCI image registries gathered by the
20-
// image-reflector-controller. v1alpha2 did some rearrangement from
21-
// v1alpha1 to make room for future enhancements; v1beta1 does not
22-
// change the schema from v1alpha2.
17+
// Package v1beta1 contains API types for the image v1beta1 API group
18+
//
19+
// Deprecated: v1beta1 is no longer supported, use v1 instead.
2320
//
2421
// +kubebuilder:object:generate=true
2522
// +groupName=image.toolkit.fluxcd.io

api/v1beta1/imageupdateautomation_types.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,8 @@ func SetImageUpdateAutomationReadiness(auto *ImageUpdateAutomation, status metav
133133
apimeta.SetStatusCondition(auto.GetStatusConditions(), newCondition)
134134
}
135135

136-
//+kubebuilder:object:root=true
137-
//+kubebuilder:subresource:status
138-
//+kubebuilder:deprecatedversion:warning="v1beta1 ImageUpdateAutomation is deprecated, upgrade to v1beta2"
139-
//+kubebuilder:printcolumn:name="Last run",type=string,JSONPath=`.status.lastAutomationRunTime`
136+
// +kubebuilder:object:root=true
137+
// +kubebuilder:skipversion
140138

141139
// ImageUpdateAutomation is the Schema for the imageupdateautomations API
142140
type ImageUpdateAutomation struct {

config/crd/bases/image.toolkit.fluxcd.io_imageupdateautomations.yaml

Lines changed: 0 additions & 313 deletions
Original file line numberDiff line numberDiff line change
@@ -18,319 +18,6 @@ spec:
1818
singular: imageupdateautomation
1919
scope: Namespaced
2020
versions:
21-
- additionalPrinterColumns:
22-
- jsonPath: .status.lastAutomationRunTime
23-
name: Last run
24-
type: string
25-
deprecated: true
26-
deprecationWarning: v1beta1 ImageUpdateAutomation is deprecated, upgrade to v1beta2
27-
name: v1beta1
28-
schema:
29-
openAPIV3Schema:
30-
description: ImageUpdateAutomation is the Schema for the imageupdateautomations
31-
API
32-
properties:
33-
apiVersion:
34-
description: |-
35-
APIVersion defines the versioned schema of this representation of an object.
36-
Servers should convert recognized schemas to the latest internal value, and
37-
may reject unrecognized values.
38-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
39-
type: string
40-
kind:
41-
description: |-
42-
Kind is a string value representing the REST resource this object represents.
43-
Servers may infer this from the endpoint the client submits requests to.
44-
Cannot be updated.
45-
In CamelCase.
46-
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
47-
type: string
48-
metadata:
49-
type: object
50-
spec:
51-
description: ImageUpdateAutomationSpec defines the desired state of ImageUpdateAutomation
52-
properties:
53-
git:
54-
description: |-
55-
GitSpec contains all the git-specific definitions. This is
56-
technically optional, but in practice mandatory until there are
57-
other kinds of source allowed.
58-
properties:
59-
checkout:
60-
description: |-
61-
Checkout gives the parameters for cloning the git repository,
62-
ready to make changes. If not present, the `spec.ref` field from the
63-
referenced `GitRepository` or its default will be used.
64-
properties:
65-
ref:
66-
description: |-
67-
Reference gives a branch, tag or commit to clone from the Git
68-
repository.
69-
properties:
70-
branch:
71-
description: Branch to check out, defaults to 'master'
72-
if no other field is defined.
73-
type: string
74-
commit:
75-
description: |-
76-
Commit SHA to check out, takes precedence over all reference fields.
77-
78-
This can be combined with Branch to shallow clone the branch, in which
79-
the commit is expected to exist.
80-
type: string
81-
name:
82-
description: |-
83-
Name of the reference to check out; takes precedence over Branch, Tag and SemVer.
84-
85-
It must be a valid Git reference: https://git-scm.com/docs/git-check-ref-format#_description
86-
Examples: "refs/heads/main", "refs/tags/v0.1.0", "refs/pull/420/head", "refs/merge-requests/1/head"
87-
type: string
88-
semver:
89-
description: SemVer tag expression to check out, takes
90-
precedence over Tag.
91-
type: string
92-
tag:
93-
description: Tag to check out, takes precedence over Branch.
94-
type: string
95-
type: object
96-
required:
97-
- ref
98-
type: object
99-
commit:
100-
description: Commit specifies how to commit to the git repository.
101-
properties:
102-
author:
103-
description: |-
104-
Author gives the email and optionally the name to use as the
105-
author of commits.
106-
properties:
107-
email:
108-
description: Email gives the email to provide when making
109-
a commit.
110-
type: string
111-
name:
112-
description: Name gives the name to provide when making
113-
a commit.
114-
type: string
115-
required:
116-
- email
117-
type: object
118-
messageTemplate:
119-
description: |-
120-
MessageTemplate provides a template for the commit message,
121-
into which will be interpolated the details of the change made.
122-
type: string
123-
signingKey:
124-
description: SigningKey provides the option to sign commits
125-
with a GPG key
126-
properties:
127-
secretRef:
128-
description: |-
129-
SecretRef holds the name to a secret that contains a 'git.asc' key
130-
corresponding to the ASCII Armored file containing the GPG signing
131-
keypair as the value. It must be in the same namespace as the
132-
ImageUpdateAutomation.
133-
properties:
134-
name:
135-
description: Name of the referent.
136-
type: string
137-
required:
138-
- name
139-
type: object
140-
required:
141-
- secretRef
142-
type: object
143-
required:
144-
- author
145-
type: object
146-
push:
147-
description: |-
148-
Push specifies how and where to push commits made by the
149-
automation. If missing, commits are pushed (back) to
150-
`.spec.checkout.branch` or its default.
151-
properties:
152-
branch:
153-
description: |-
154-
Branch specifies that commits should be pushed to the branch
155-
named. The branch is created using `.spec.checkout.branch` as the
156-
starting point, if it doesn't already exist.
157-
type: string
158-
options:
159-
additionalProperties:
160-
type: string
161-
description: |-
162-
Options specifies the push options that are sent to the Git
163-
server when performing a push operation. For details, see:
164-
https://git-scm.com/docs/git-push#Documentation/git-push.txt---push-optionltoptiongt
165-
type: object
166-
refspec:
167-
description: |-
168-
Refspec specifies the Git Refspec to use for a push operation.
169-
If both Branch and Refspec are provided, then the commit is pushed
170-
to the branch and also using the specified refspec.
171-
For more details about Git Refspecs, see:
172-
https://git-scm.com/book/en/v2/Git-Internals-The-Refspec
173-
type: string
174-
type: object
175-
required:
176-
- commit
177-
type: object
178-
interval:
179-
description: |-
180-
Interval gives an lower bound for how often the automation
181-
run should be attempted.
182-
pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
183-
type: string
184-
sourceRef:
185-
description: |-
186-
SourceRef refers to the resource giving access details
187-
to a git repository.
188-
properties:
189-
apiVersion:
190-
description: API version of the referent.
191-
type: string
192-
kind:
193-
default: GitRepository
194-
description: Kind of the referent.
195-
enum:
196-
- GitRepository
197-
type: string
198-
name:
199-
description: Name of the referent.
200-
type: string
201-
namespace:
202-
description: Namespace of the referent, defaults to the namespace
203-
of the Kubernetes resource object that contains the reference.
204-
type: string
205-
required:
206-
- kind
207-
- name
208-
type: object
209-
suspend:
210-
description: |-
211-
Suspend tells the controller to not run this automation, until
212-
it is unset (or set to false). Defaults to false.
213-
type: boolean
214-
update:
215-
default:
216-
strategy: Setters
217-
description: |-
218-
Update gives the specification for how to update the files in
219-
the repository. This can be left empty, to use the default
220-
value.
221-
properties:
222-
path:
223-
description: |-
224-
Path to the directory containing the manifests to be updated.
225-
Defaults to 'None', which translates to the root path
226-
of the GitRepositoryRef.
227-
type: string
228-
strategy:
229-
default: Setters
230-
description: Strategy names the strategy to be used.
231-
enum:
232-
- Setters
233-
type: string
234-
required:
235-
- strategy
236-
type: object
237-
required:
238-
- interval
239-
- sourceRef
240-
type: object
241-
status:
242-
default:
243-
observedGeneration: -1
244-
description: ImageUpdateAutomationStatus defines the observed state of
245-
ImageUpdateAutomation
246-
properties:
247-
conditions:
248-
items:
249-
description: Condition contains details for one aspect of the current
250-
state of this API Resource.
251-
properties:
252-
lastTransitionTime:
253-
description: |-
254-
lastTransitionTime is the last time the condition transitioned from one status to another.
255-
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
256-
format: date-time
257-
type: string
258-
message:
259-
description: |-
260-
message is a human readable message indicating details about the transition.
261-
This may be an empty string.
262-
maxLength: 32768
263-
type: string
264-
observedGeneration:
265-
description: |-
266-
observedGeneration represents the .metadata.generation that the condition was set based upon.
267-
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
268-
with respect to the current state of the instance.
269-
format: int64
270-
minimum: 0
271-
type: integer
272-
reason:
273-
description: |-
274-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
275-
Producers of specific condition types may define expected values and meanings for this field,
276-
and whether the values are considered a guaranteed API.
277-
The value should be a CamelCase string.
278-
This field may not be empty.
279-
maxLength: 1024
280-
minLength: 1
281-
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
282-
type: string
283-
status:
284-
description: status of the condition, one of True, False, Unknown.
285-
enum:
286-
- "True"
287-
- "False"
288-
- Unknown
289-
type: string
290-
type:
291-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
292-
maxLength: 316
293-
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])$
294-
type: string
295-
required:
296-
- lastTransitionTime
297-
- message
298-
- reason
299-
- status
300-
- type
301-
type: object
302-
type: array
303-
lastAutomationRunTime:
304-
description: |-
305-
LastAutomationRunTime records the last time the controller ran
306-
this automation through to completion (even if no updates were
307-
made).
308-
format: date-time
309-
type: string
310-
lastHandledReconcileAt:
311-
description: |-
312-
LastHandledReconcileAt holds the value of the most recent
313-
reconcile request value, so a change of the annotation value
314-
can be detected.
315-
type: string
316-
lastPushCommit:
317-
description: |-
318-
LastPushCommit records the SHA1 of the last commit made by the
319-
controller, for this automation object
320-
type: string
321-
lastPushTime:
322-
description: LastPushTime records the time of the last pushed change.
323-
format: date-time
324-
type: string
325-
observedGeneration:
326-
format: int64
327-
type: integer
328-
type: object
329-
type: object
330-
served: true
331-
storage: false
332-
subresources:
333-
status: {}
33421
- additionalPrinterColumns:
33522
- jsonPath: .status.conditions[?(@.type=="Ready")].status
33623
name: Ready

config/samples/image_v1beta1_imageupdateautomation.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)