Skip to content

Commit 62864d2

Browse files
kannon92kannon92
committed
revert openshift/api bump
1 parent 6e58488 commit 62864d2

File tree

11 files changed

+318
-81
lines changed

11 files changed

+318
-81
lines changed

‎config/schemapatch/kueue-operator.crd.yaml‎

Lines changed: 143 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ spec:
3939
metadata:
4040
type: object
4141
spec:
42-
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorSpec'
4342
description: spec holds user settable values for configuration
4443
type: object
4544
required:
@@ -388,10 +387,152 @@ spec:
388387
evicted and requeued in the same cluster queue.
389388
Defaults to 5min.
390389
type: string
390+
logLevel:
391+
description: |-
392+
logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a
393+
simple way to manage coarse grained logging choices that operators have to interpret for their operands.
394+
395+
Valid values are: "Normal", "Debug", "Trace", "TraceAll".
396+
Defaults to "Normal".
397+
type: string
398+
default: Normal
399+
enum:
400+
- ""
401+
- Normal
402+
- Debug
403+
- Trace
404+
- TraceAll
405+
managementState:
406+
description: managementState indicates whether and how the operator should manage the component
407+
type: string
408+
pattern: ^(Managed|Unmanaged|Force|Removed)$
409+
observedConfig:
410+
description: |-
411+
observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because
412+
it is an input to the level for the operator
413+
type: object
414+
nullable: true
415+
x-kubernetes-preserve-unknown-fields: true
416+
operatorLogLevel:
417+
description: |-
418+
operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a
419+
simple way to manage coarse grained logging choices that operators have to interpret for themselves.
420+
421+
Valid values are: "Normal", "Debug", "Trace", "TraceAll".
422+
Defaults to "Normal".
423+
type: string
424+
default: Normal
425+
enum:
426+
- ""
427+
- Normal
428+
- Debug
429+
- Trace
430+
- TraceAll
431+
unsupportedConfigOverrides:
432+
description: |-
433+
unsupportedConfigOverrides overrides the final configuration that was computed by the operator.
434+
Red Hat does not support the use of this field.
435+
Misuse of this field could lead to unexpected behavior or conflict with other configuration options.
436+
Seek guidance from the Red Hat support before using this field.
437+
Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.
438+
type: object
439+
nullable: true
440+
x-kubernetes-preserve-unknown-fields: true
391441
status:
392-
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorStatus'
393442
description: status holds observed values from the cluster. They may not be overridden.
394443
type: object
444+
properties:
445+
conditions:
446+
description: conditions is a list of conditions and their status
447+
type: array
448+
items:
449+
description: OperatorCondition is just the standard condition fields.
450+
type: object
451+
required:
452+
- lastTransitionTime
453+
- status
454+
- type
455+
properties:
456+
lastTransitionTime:
457+
description: |-
458+
lastTransitionTime is the last time the condition transitioned from one status to another.
459+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
460+
type: string
461+
format: date-time
462+
message:
463+
type: string
464+
reason:
465+
type: string
466+
status:
467+
description: status of the condition, one of True, False, Unknown.
468+
type: string
469+
enum:
470+
- "True"
471+
- "False"
472+
- Unknown
473+
type:
474+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
475+
type: string
476+
maxLength: 316
477+
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])$
478+
x-kubernetes-list-map-keys:
479+
- type
480+
x-kubernetes-list-type: map
481+
generations:
482+
description: generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.
483+
type: array
484+
items:
485+
description: GenerationStatus keeps track of the generation for a given resource so that decisions about forced updates can be made.
486+
type: object
487+
required:
488+
- group
489+
- name
490+
- namespace
491+
- resource
492+
properties:
493+
group:
494+
description: group is the group of the thing you're tracking
495+
type: string
496+
hash:
497+
description: hash is an optional field set for resources without generation that are content sensitive like secrets and configmaps
498+
type: string
499+
lastGeneration:
500+
description: lastGeneration is the last generation of the workload controller involved
501+
type: integer
502+
format: int64
503+
name:
504+
description: name is the name of the thing you're tracking
505+
type: string
506+
namespace:
507+
description: namespace is where the thing you're tracking is
508+
type: string
509+
resource:
510+
description: resource is the resource type of the thing you're tracking
511+
type: string
512+
x-kubernetes-list-map-keys:
513+
- group
514+
- resource
515+
- namespace
516+
- name
517+
x-kubernetes-list-type: map
518+
latestAvailableRevision:
519+
description: latestAvailableRevision is the deploymentID of the most recent deployment
520+
type: integer
521+
format: int32
522+
x-kubernetes-validations:
523+
- rule: self >= oldSelf
524+
message: must only increase
525+
observedGeneration:
526+
description: observedGeneration is the last generation change you've dealt with
527+
type: integer
528+
format: int64
529+
readyReplicas:
530+
description: readyReplicas indicates how many replicas are ready and at the desired state
531+
type: integer
532+
format: int32
533+
version:
534+
description: version is the level this availability applies to
535+
type: string
395536
served: true
396537
storage: true
397538
subresources:

‎config/schemapatch/operator.openshift.io_kueues.yaml‎

Lines changed: 143 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ spec:
3939
metadata:
4040
type: object
4141
spec:
42-
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorSpec'
4342
description: spec holds user settable values for configuration
4443
type: object
4544
required:
@@ -388,10 +387,152 @@ spec:
388387
evicted and requeued in the same cluster queue.
389388
Defaults to 5min.
390389
type: string
390+
logLevel:
391+
description: |-
392+
logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a
393+
simple way to manage coarse grained logging choices that operators have to interpret for their operands.
394+
395+
Valid values are: "Normal", "Debug", "Trace", "TraceAll".
396+
Defaults to "Normal".
397+
type: string
398+
default: Normal
399+
enum:
400+
- ""
401+
- Normal
402+
- Debug
403+
- Trace
404+
- TraceAll
405+
managementState:
406+
description: managementState indicates whether and how the operator should manage the component
407+
type: string
408+
pattern: ^(Managed|Unmanaged|Force|Removed)$
409+
observedConfig:
410+
description: |-
411+
observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because
412+
it is an input to the level for the operator
413+
type: object
414+
nullable: true
415+
x-kubernetes-preserve-unknown-fields: true
416+
operatorLogLevel:
417+
description: |-
418+
operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a
419+
simple way to manage coarse grained logging choices that operators have to interpret for themselves.
420+
421+
Valid values are: "Normal", "Debug", "Trace", "TraceAll".
422+
Defaults to "Normal".
423+
type: string
424+
default: Normal
425+
enum:
426+
- ""
427+
- Normal
428+
- Debug
429+
- Trace
430+
- TraceAll
431+
unsupportedConfigOverrides:
432+
description: |-
433+
unsupportedConfigOverrides overrides the final configuration that was computed by the operator.
434+
Red Hat does not support the use of this field.
435+
Misuse of this field could lead to unexpected behavior or conflict with other configuration options.
436+
Seek guidance from the Red Hat support before using this field.
437+
Use of this property blocks cluster upgrades, it must be removed before upgrading your cluster.
438+
type: object
439+
nullable: true
440+
x-kubernetes-preserve-unknown-fields: true
391441
status:
392-
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorStatus'
393442
description: status holds observed values from the cluster. They may not be overridden.
394443
type: object
444+
properties:
445+
conditions:
446+
description: conditions is a list of conditions and their status
447+
type: array
448+
items:
449+
description: OperatorCondition is just the standard condition fields.
450+
type: object
451+
required:
452+
- lastTransitionTime
453+
- status
454+
- type
455+
properties:
456+
lastTransitionTime:
457+
description: |-
458+
lastTransitionTime is the last time the condition transitioned from one status to another.
459+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
460+
type: string
461+
format: date-time
462+
message:
463+
type: string
464+
reason:
465+
type: string
466+
status:
467+
description: status of the condition, one of True, False, Unknown.
468+
type: string
469+
enum:
470+
- "True"
471+
- "False"
472+
- Unknown
473+
type:
474+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
475+
type: string
476+
maxLength: 316
477+
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])$
478+
x-kubernetes-list-map-keys:
479+
- type
480+
x-kubernetes-list-type: map
481+
generations:
482+
description: generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.
483+
type: array
484+
items:
485+
description: GenerationStatus keeps track of the generation for a given resource so that decisions about forced updates can be made.
486+
type: object
487+
required:
488+
- group
489+
- name
490+
- namespace
491+
- resource
492+
properties:
493+
group:
494+
description: group is the group of the thing you're tracking
495+
type: string
496+
hash:
497+
description: hash is an optional field set for resources without generation that are content sensitive like secrets and configmaps
498+
type: string
499+
lastGeneration:
500+
description: lastGeneration is the last generation of the workload controller involved
501+
type: integer
502+
format: int64
503+
name:
504+
description: name is the name of the thing you're tracking
505+
type: string
506+
namespace:
507+
description: namespace is where the thing you're tracking is
508+
type: string
509+
resource:
510+
description: resource is the resource type of the thing you're tracking
511+
type: string
512+
x-kubernetes-list-map-keys:
513+
- group
514+
- resource
515+
- namespace
516+
- name
517+
x-kubernetes-list-type: map
518+
latestAvailableRevision:
519+
description: latestAvailableRevision is the deploymentID of the most recent deployment
520+
type: integer
521+
format: int32
522+
x-kubernetes-validations:
523+
- rule: self >= oldSelf
524+
message: must only increase
525+
observedGeneration:
526+
description: observedGeneration is the last generation change you've dealt with
527+
type: integer
528+
format: int64
529+
readyReplicas:
530+
description: readyReplicas indicates how many replicas are ready and at the desired state
531+
type: integer
532+
format: int32
533+
version:
534+
description: version is the level this availability applies to
535+
type: string
395536
served: true
396537
storage: true
397538
subresources:

‎deploy/crd/kueue-operator.crd.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.1
6+
controller-gen.kubebuilder.io/version: v0.17.2
77
name: kueues.operator.openshift.io
88
spec:
99
group: operator.openshift.io

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/google/go-cmp v0.6.0
99
github.com/onsi/ginkgo/v2 v2.22.2
1010
github.com/onsi/gomega v1.36.2
11-
github.com/openshift/api v0.0.0-20250228110707-635291d6fdf1
11+
github.com/openshift/api v0.0.0-20250131134714-405421854f2b
1212
github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2
1313
github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a
1414
github.com/openshift/library-go v0.0.0-20250228164547-bad2d1bf3a37
@@ -20,6 +20,7 @@ require (
2020
k8s.io/apimachinery v0.32.2
2121
k8s.io/client-go v0.32.2
2222
k8s.io/code-generator v0.32.2
23+
k8s.io/component-base v0.32.2
2324
k8s.io/klog/v2 v2.130.1
2425
k8s.io/utils v0.0.0-20241210054802-24370beab758
2526
sigs.k8s.io/controller-tools v0.17.2
@@ -98,15 +99,15 @@ require (
9899
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
99100
go.uber.org/multierr v1.11.0 // indirect
100101
go.uber.org/zap v1.27.0 // indirect
101-
golang.org/x/crypto v0.32.0 // indirect
102+
golang.org/x/crypto v0.36.0 // indirect
102103
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
103104
golang.org/x/mod v0.22.0 // indirect
104-
golang.org/x/net v0.34.0 // indirect
105+
golang.org/x/net v0.37.0 // indirect
105106
golang.org/x/oauth2 v0.23.0 // indirect
106-
golang.org/x/sync v0.10.0 // indirect
107-
golang.org/x/sys v0.29.0 // indirect
108-
golang.org/x/term v0.28.0 // indirect
109-
golang.org/x/text v0.21.0 // indirect
107+
golang.org/x/sync v0.12.0 // indirect
108+
golang.org/x/sys v0.31.0 // indirect
109+
golang.org/x/term v0.30.0 // indirect
110+
golang.org/x/text v0.23.0 // indirect
110111
golang.org/x/time v0.7.0 // indirect
111112
golang.org/x/tools v0.29.0 // indirect
112113
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
@@ -119,13 +120,12 @@ require (
119120
gopkg.in/yaml.v2 v2.4.0 // indirect
120121
gopkg.in/yaml.v3 v3.0.1 // indirect
121122
k8s.io/apiserver v0.32.2 // indirect
122-
k8s.io/component-base v0.32.2 // indirect
123123
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
124124
k8s.io/kms v0.32.2 // indirect
125125
k8s.io/kube-aggregator v0.32.2 // indirect
126126
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
127127
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
128128
sigs.k8s.io/controller-runtime v0.19.3 // indirect
129-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
129+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
130130
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
131131
)

0 commit comments

Comments
 (0)