Skip to content

Commit 38b3111

Browse files
jbw976jbw976
authored
Merge pull request #930 from jbw976/1.20-feat-sync
Update feature flags, helm chart values, and APIs for v1.20
2 parents bd70135 + 84080fa commit 38b3111

12 files changed

+634
-177
lines changed

‎content/master/api/crds/apiextensions.crossplane.io_usages.yaml

Lines changed: 197 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,3 +213,200 @@ spec:
213213
storage: true
214214
subresources:
215215
status: {}
216+
- additionalPrinterColumns:
217+
- jsonPath: .metadata.annotations.crossplane\.io/usage-details
218+
name: DETAILS
219+
type: string
220+
- jsonPath: .status.conditions[?(@.type=='Ready')].status
221+
name: READY
222+
type: string
223+
- jsonPath: .metadata.creationTimestamp
224+
name: AGE
225+
type: date
226+
name: v1beta1
227+
schema:
228+
openAPIV3Schema:
229+
description: |-
230+
A Usage defines a deletion blocking relationship between two resources.
231+
232+
Usages prevent accidental deletion of a single resource or deletion of
233+
resources with dependent resources.
234+
235+
Read the Crossplane documentation for
236+
[more information about Compositions](https://docs.crossplane.io/latest/concepts/usages).
237+
properties:
238+
apiVersion:
239+
description: |-
240+
APIVersion defines the versioned schema of this representation of an object.
241+
Servers should convert recognized schemas to the latest internal value, and
242+
may reject unrecognized values.
243+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
244+
type: string
245+
kind:
246+
description: |-
247+
Kind is a string value representing the REST resource this object represents.
248+
Servers may infer this from the endpoint the client submits requests to.
249+
Cannot be updated.
250+
In CamelCase.
251+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
252+
type: string
253+
metadata:
254+
type: object
255+
spec:
256+
description: UsageSpec defines the desired state of Usage.
257+
properties:
258+
by:
259+
description: By is the resource that is "using the other resource".
260+
properties:
261+
apiVersion:
262+
description: API version of the referent.
263+
type: string
264+
kind:
265+
description: |-
266+
Kind of the referent.
267+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
268+
type: string
269+
resourceRef:
270+
description: Reference to the resource.
271+
properties:
272+
name:
273+
description: Name of the referent.
274+
type: string
275+
required:
276+
- name
277+
type: object
278+
resourceSelector:
279+
description: |-
280+
Selector to the resource.
281+
This field will be ignored if ResourceRef is set.
282+
properties:
283+
matchControllerRef:
284+
description: |-
285+
MatchControllerRef ensures an object with the same controller reference
286+
as the selecting object is selected.
287+
type: boolean
288+
matchLabels:
289+
additionalProperties:
290+
type: string
291+
description: MatchLabels ensures an object with matching labels
292+
is selected.
293+
type: object
294+
type: object
295+
type: object
296+
x-kubernetes-validations:
297+
- message: either a resource reference or a resource selector should
298+
be set.
299+
rule: has(self.resourceRef) || has(self.resourceSelector)
300+
of:
301+
description: Of is the resource that is "being used".
302+
properties:
303+
apiVersion:
304+
description: API version of the referent.
305+
type: string
306+
kind:
307+
description: |-
308+
Kind of the referent.
309+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
310+
type: string
311+
resourceRef:
312+
description: Reference to the resource.
313+
properties:
314+
name:
315+
description: Name of the referent.
316+
type: string
317+
required:
318+
- name
319+
type: object
320+
resourceSelector:
321+
description: |-
322+
Selector to the resource.
323+
This field will be ignored if ResourceRef is set.
324+
properties:
325+
matchControllerRef:
326+
description: |-
327+
MatchControllerRef ensures an object with the same controller reference
328+
as the selecting object is selected.
329+
type: boolean
330+
matchLabels:
331+
additionalProperties:
332+
type: string
333+
description: MatchLabels ensures an object with matching labels
334+
is selected.
335+
type: object
336+
type: object
337+
type: object
338+
x-kubernetes-validations:
339+
- message: either a resource reference or a resource selector should
340+
be set.
341+
rule: has(self.resourceRef) || has(self.resourceSelector)
342+
reason:
343+
description: Reason is the reason for blocking deletion of the resource.
344+
type: string
345+
replayDeletion:
346+
description: ReplayDeletion will trigger a deletion on the used resource
347+
during the deletion of the usage itself, if it was attempted to
348+
be deleted at least once.
349+
type: boolean
350+
required:
351+
- of
352+
type: object
353+
x-kubernetes-validations:
354+
- message: either "spec.by" or "spec.reason" must be specified.
355+
rule: has(self.by) || has(self.reason)
356+
status:
357+
description: UsageStatus defines the observed state of Usage.
358+
properties:
359+
conditions:
360+
description: Conditions of the resource.
361+
items:
362+
description: A Condition that may apply to a resource.
363+
properties:
364+
lastTransitionTime:
365+
description: |-
366+
LastTransitionTime is the last time this condition transitioned from one
367+
status to another.
368+
format: date-time
369+
type: string
370+
message:
371+
description: |-
372+
A Message containing details about this condition's last transition from
373+
one status to another, if any.
374+
type: string
375+
observedGeneration:
376+
description: |-
377+
ObservedGeneration represents the .metadata.generation that the condition was set based upon.
378+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
379+
with respect to the current state of the instance.
380+
format: int64
381+
type: integer
382+
reason:
383+
description: A Reason for this condition's last transition from
384+
one status to another.
385+
type: string
386+
status:
387+
description: Status of this condition; is it currently True,
388+
False, or Unknown?
389+
type: string
390+
type:
391+
description: |-
392+
Type of this condition. At most one of each condition type may apply to
393+
a resource at any point in time.
394+
type: string
395+
required:
396+
- lastTransitionTime
397+
- reason
398+
- status
399+
- type
400+
type: object
401+
type: array
402+
x-kubernetes-list-map-keys:
403+
- type
404+
x-kubernetes-list-type: map
405+
type: object
406+
required:
407+
- spec
408+
type: object
409+
served: true
410+
storage: false
411+
subresources:
412+
status: {}

‎content/master/api/crds/pkg.crossplane.io_configurationrevisions.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,27 @@ spec:
146146
description: PackageRevisionStatus represents the observed state of a
147147
PackageRevision.
148148
properties:
149+
appliedImageConfigRefs:
150+
description: |-
151+
AppliedImageConfigRefs records any image configs that were applied in
152+
reconciling this revision, and what they were used for.
153+
items:
154+
description: |-
155+
ImageConfigRef is a reference to an image config that indicates how the
156+
referenced image config was used by the package manager.
157+
properties:
158+
name:
159+
description: Name is the name of the image config.
160+
type: string
161+
reason:
162+
description: Reason indicates what the image config was used
163+
for.
164+
type: string
165+
required:
166+
- name
167+
- reason
168+
type: object
169+
type: array
149170
conditions:
150171
description: Conditions of the resource.
151172
items:
@@ -281,6 +302,12 @@ spec:
281302
- verbs
282303
type: object
283304
type: array
305+
resolvedImage:
306+
description: |-
307+
ResolvedPackage is the name of the package that was installed. It may be
308+
different from spec.image if the package path was rewritten using an
309+
image config.
310+
type: string
284311
type: object
285312
type: object
286313
served: true

‎content/master/api/crds/pkg.crossplane.io_configurations.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,27 @@ spec:
138138
status:
139139
description: ConfigurationStatus represents the observed state of a Configuration.
140140
properties:
141+
appliedImageConfigRefs:
142+
description: |-
143+
AppliedImageConfigRefs records any image configs that were applied in
144+
reconciling this package, and what they were used for.
145+
items:
146+
description: |-
147+
ImageConfigRef is a reference to an image config that indicates how the
148+
referenced image config was used by the package manager.
149+
properties:
150+
name:
151+
description: Name is the name of the image config.
152+
type: string
153+
reason:
154+
description: Reason indicates what the image config was used
155+
for.
156+
type: string
157+
required:
158+
- name
159+
- reason
160+
type: object
161+
type: array
141162
conditions:
142163
description: Conditions of the resource.
143164
items:
@@ -199,6 +220,12 @@ spec:
199220
reflect the most up to date revision, whether it has been activated or
200221
not.
201222
type: string
223+
resolvedPackage:
224+
description: |-
225+
ResolvedPackage is the name of the package that was used for version
226+
resolution. It may be different from spec.package if the package path was
227+
rewritten using an image config.
228+
type: string
202229
type: object
203230
type: object
204231
served: true

‎content/master/api/crds/pkg.crossplane.io_functionrevisions.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,27 @@ spec:
189189
description: FunctionRevisionStatus represents the observed state of a
190190
FunctionRevision.
191191
properties:
192+
appliedImageConfigRefs:
193+
description: |-
194+
AppliedImageConfigRefs records any image configs that were applied in
195+
reconciling this revision, and what they were used for.
196+
items:
197+
description: |-
198+
ImageConfigRef is a reference to an image config that indicates how the
199+
referenced image config was used by the package manager.
200+
properties:
201+
name:
202+
description: Name is the name of the image config.
203+
type: string
204+
reason:
205+
description: Reason indicates what the image config was used
206+
for.
207+
type: string
208+
required:
209+
- name
210+
- reason
211+
type: object
212+
type: array
192213
conditions:
193214
description: Conditions of the resource.
194215
items:
@@ -329,6 +350,12 @@ spec:
329350
- verbs
330351
type: object
331352
type: array
353+
resolvedImage:
354+
description: |-
355+
ResolvedPackage is the name of the package that was installed. It may be
356+
different from spec.image if the package path was rewritten using an
357+
image config.
358+
type: string
332359
type: object
333360
type: object
334361
served: true
@@ -507,6 +534,27 @@ spec:
507534
description: FunctionRevisionStatus represents the observed state of a
508535
FunctionRevision.
509536
properties:
537+
appliedImageConfigRefs:
538+
description: |-
539+
AppliedImageConfigRefs records any image configs that were applied in
540+
reconciling this revision, and what they were used for.
541+
items:
542+
description: |-
543+
ImageConfigRef is a reference to an image config that indicates how the
544+
referenced image config was used by the package manager.
545+
properties:
546+
name:
547+
description: Name is the name of the image config.
548+
type: string
549+
reason:
550+
description: Reason indicates what the image config was used
551+
for.
552+
type: string
553+
required:
554+
- name
555+
- reason
556+
type: object
557+
type: array
510558
conditions:
511559
description: Conditions of the resource.
512560
items:
@@ -647,6 +695,12 @@ spec:
647695
- verbs
648696
type: object
649697
type: array
698+
resolvedImage:
699+
description: |-
700+
ResolvedPackage is the name of the package that was installed. It may be
701+
different from spec.image if the package path was rewritten using an
702+
image config.
703+
type: string
650704
type: object
651705
type: object
652706
served: true

0 commit comments

Comments
 (0)