Skip to content

Commit a3e4639

Browse files
hongkailiuhongkailiu
committed
hack/update-codegen.sh
1 parent e12b470 commit a3e4639

File tree

6 files changed

+414
-28
lines changed

6 files changed

+414
-28
lines changed

‎config/v1/zz_generated.deepcopy.go

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

‎config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/AAA_ungated.yaml

Lines changed: 108 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,14 @@ spec:
156156
the previous version will cause a rollback to be attempted. Not all
157157
rollbacks will succeed.
158158
properties:
159+
accept:
160+
description: |-
161+
accept allows an administrator to specify the names of ConditionalUpdateRisk
162+
those are considered acceptable. A conditional update is accepted by Cluster-Version
163+
operator only if all of its risks are acceptable.
164+
items:
165+
type: string
166+
type: array
159167
architecture:
160168
description: |-
161169
architecture is an optional field that indicates the desired
@@ -362,6 +370,90 @@ spec:
362370
type: array
363371
x-kubernetes-list-type: atomic
364372
type: object
373+
conditionalUpdateRisks:
374+
description: |-
375+
conditionalUpdateRisks represent issues for ConditionalUpdates.
376+
The cluster-version operator will evaluate all risks associated to a conditional
377+
update when it is the desired update and only accept it if all its associated
378+
risks are in "spec.desiredUpdate.accept".
379+
items:
380+
description: |-
381+
ConditionalUpdateRisk represents a reason and cluster-state
382+
for not recommending a conditional update.
383+
properties:
384+
matchingRules:
385+
description: |-
386+
matchingRules is a slice of conditions for deciding which
387+
clusters match the risk and which do not. The slice is
388+
ordered by decreasing precedence. The cluster-version
389+
operator will walk the slice in order, and stop after the
390+
first it can successfully evaluate. If no condition can be
391+
successfully evaluated, the update will not be recommended.
392+
items:
393+
description: |-
394+
ClusterCondition is a union of typed cluster conditions. The 'type'
395+
property determines which of the type-specific properties are relevant.
396+
When evaluated on a cluster, the condition may match, not match, or
397+
fail to evaluate.
398+
properties:
399+
promql:
400+
description: promql represents a cluster condition based
401+
on PromQL.
402+
properties:
403+
promql:
404+
description: |-
405+
promql is a PromQL query classifying clusters. This query
406+
query should return a 1 in the match case and a 0 in the
407+
does-not-match case. Queries which return no time
408+
series, or which return values besides 0 or 1, are
409+
evaluation failures.
410+
type: string
411+
required:
412+
- promql
413+
type: object
414+
type:
415+
description: |-
416+
type represents the cluster-condition type. This defines
417+
the members and semantics of any additional properties.
418+
enum:
419+
- Always
420+
- PromQL
421+
type: string
422+
required:
423+
- type
424+
type: object
425+
minItems: 1
426+
type: array
427+
x-kubernetes-list-type: atomic
428+
message:
429+
description: |-
430+
message provides additional information about the risk of
431+
updating, in the event that matchingRules match the cluster
432+
state. This is only to be consumed by humans. It may
433+
contain Line Feed characters (U+000A), which should be
434+
rendered as new lines.
435+
minLength: 1
436+
type: string
437+
name:
438+
description: |-
439+
name is the CamelCase reason for not recommending a
440+
conditional update, in the event that matchingRules match the
441+
cluster state.
442+
minLength: 1
443+
type: string
444+
url:
445+
description: url contains information about this risk.
446+
format: uri
447+
minLength: 1
448+
type: string
449+
required:
450+
- matchingRules
451+
- message
452+
- name
453+
- url
454+
type: object
455+
type: array
456+
x-kubernetes-list-type: atomic
365457
conditionalUpdates:
366458
description: |-
367459
conditionalUpdates contains the list of updates that may be
@@ -475,13 +567,23 @@ spec:
475567
- image
476568
- version
477569
type: object
570+
riskNames:
571+
description: |-
572+
riskNames are names of status.conditionalUpdateRisks
573+
that are associated with the release in a ConditionalUpdate
574+
items:
575+
type: string
576+
minItems: 1
577+
type: array
578+
x-kubernetes-list-type: set
478579
risks:
479580
description: |-
480-
risks represents the range of issues associated with
581+
risks represent the range of issues associated with
481582
updating to the target release. The cluster-version
482583
operator will evaluate all entries, and only recommend the
483584
update if there is at least one entry and all entries
484585
recommend the update.
586+
DEPRECATED: the risks has been deprecated by riskNames and will be removed in a future release.
485587
items:
486588
description: |-
487589
ConditionalUpdateRisk represents a reason and cluster-state
@@ -565,6 +667,7 @@ spec:
565667
x-kubernetes-list-type: map
566668
required:
567669
- release
670+
- riskNames
568671
- risks
569672
type: object
570673
type: array
@@ -665,10 +768,11 @@ spec:
665768
acceptedRisks:
666769
description: |-
667770
acceptedRisks records risks which were accepted to initiate the update.
668-
For example, it may menition an Upgradeable=False or missing signature
669-
that was overriden via desiredUpdate.force, or an update that was
771+
For example, it may mention an Upgradeable=False or missing signature
772+
that was overridden via desiredUpdate.force, or an update that was
670773
initiated despite not being in the availableUpdates set of recommended
671-
update targets.
774+
update targets, or in the conditionUpdates set and all associated risks
775+
are specified in "spec.desiredUpdate.accept".
672776
type: string
673777
completionTime:
674778
description: |-

‎config/v1/zz_generated.featuregated-crd-manifests/clusterversions.config.openshift.io/ImageStreamImportMode.yaml

Lines changed: 108 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,14 @@ spec:
156156
the previous version will cause a rollback to be attempted. Not all
157157
rollbacks will succeed.
158158
properties:
159+
accept:
160+
description: |-
161+
accept allows an administrator to specify the names of ConditionalUpdateRisk
162+
those are considered acceptable. A conditional update is accepted by Cluster-Version
163+
operator only if all of its risks are acceptable.
164+
items:
165+
type: string
166+
type: array
159167
architecture:
160168
description: |-
161169
architecture is an optional field that indicates the desired
@@ -373,6 +381,90 @@ spec:
373381
type: array
374382
x-kubernetes-list-type: atomic
375383
type: object
384+
conditionalUpdateRisks:
385+
description: |-
386+
conditionalUpdateRisks represent issues for ConditionalUpdates.
387+
The cluster-version operator will evaluate all risks associated to a conditional
388+
update when it is the desired update and only accept it if all its associated
389+
risks are in "spec.desiredUpdate.accept".
390+
items:
391+
description: |-
392+
ConditionalUpdateRisk represents a reason and cluster-state
393+
for not recommending a conditional update.
394+
properties:
395+
matchingRules:
396+
description: |-
397+
matchingRules is a slice of conditions for deciding which
398+
clusters match the risk and which do not. The slice is
399+
ordered by decreasing precedence. The cluster-version
400+
operator will walk the slice in order, and stop after the
401+
first it can successfully evaluate. If no condition can be
402+
successfully evaluated, the update will not be recommended.
403+
items:
404+
description: |-
405+
ClusterCondition is a union of typed cluster conditions. The 'type'
406+
property determines which of the type-specific properties are relevant.
407+
When evaluated on a cluster, the condition may match, not match, or
408+
fail to evaluate.
409+
properties:
410+
promql:
411+
description: promql represents a cluster condition based
412+
on PromQL.
413+
properties:
414+
promql:
415+
description: |-
416+
promql is a PromQL query classifying clusters. This query
417+
query should return a 1 in the match case and a 0 in the
418+
does-not-match case. Queries which return no time
419+
series, or which return values besides 0 or 1, are
420+
evaluation failures.
421+
type: string
422+
required:
423+
- promql
424+
type: object
425+
type:
426+
description: |-
427+
type represents the cluster-condition type. This defines
428+
the members and semantics of any additional properties.
429+
enum:
430+
- Always
431+
- PromQL
432+
type: string
433+
required:
434+
- type
435+
type: object
436+
minItems: 1
437+
type: array
438+
x-kubernetes-list-type: atomic
439+
message:
440+
description: |-
441+
message provides additional information about the risk of
442+
updating, in the event that matchingRules match the cluster
443+
state. This is only to be consumed by humans. It may
444+
contain Line Feed characters (U+000A), which should be
445+
rendered as new lines.
446+
minLength: 1
447+
type: string
448+
name:
449+
description: |-
450+
name is the CamelCase reason for not recommending a
451+
conditional update, in the event that matchingRules match the
452+
cluster state.
453+
minLength: 1
454+
type: string
455+
url:
456+
description: url contains information about this risk.
457+
format: uri
458+
minLength: 1
459+
type: string
460+
required:
461+
- matchingRules
462+
- message
463+
- name
464+
- url
465+
type: object
466+
type: array
467+
x-kubernetes-list-type: atomic
376468
conditionalUpdates:
377469
description: |-
378470
conditionalUpdates contains the list of updates that may be
@@ -497,13 +589,23 @@ spec:
497589
- image
498590
- version
499591
type: object
592+
riskNames:
593+
description: |-
594+
riskNames are names of status.conditionalUpdateRisks
595+
that are associated with the release in a ConditionalUpdate
596+
items:
597+
type: string
598+
minItems: 1
599+
type: array
600+
x-kubernetes-list-type: set
500601
risks:
501602
description: |-
502-
risks represents the range of issues associated with
603+
risks represent the range of issues associated with
503604
updating to the target release. The cluster-version
504605
operator will evaluate all entries, and only recommend the
505606
update if there is at least one entry and all entries
506607
recommend the update.
608+
DEPRECATED: the risks has been deprecated by riskNames and will be removed in a future release.
507609
items:
508610
description: |-
509611
ConditionalUpdateRisk represents a reason and cluster-state
@@ -587,6 +689,7 @@ spec:
587689
x-kubernetes-list-type: map
588690
required:
589691
- release
692+
- riskNames
590693
- risks
591694
type: object
592695
type: array
@@ -698,10 +801,11 @@ spec:
698801
acceptedRisks:
699802
description: |-
700803
acceptedRisks records risks which were accepted to initiate the update.
701-
For example, it may menition an Upgradeable=False or missing signature
702-
that was overriden via desiredUpdate.force, or an update that was
804+
For example, it may mention an Upgradeable=False or missing signature
805+
that was overridden via desiredUpdate.force, or an update that was
703806
initiated despite not being in the availableUpdates set of recommended
704-
update targets.
807+
update targets, or in the conditionUpdates set and all associated risks
808+
are specified in "spec.desiredUpdate.accept".
705809
type: string
706810
completionTime:
707811
description: |-

0 commit comments

Comments
 (0)