Skip to content

Commit b408de6

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #73 from kannon92/bump-api-and-chat-about-fix
Bump openshift/api and mention failure.
2 parents 196981b + c7a6202 commit b408de6

File tree

81 files changed

+2416
-819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2416
-819
lines changed

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

Lines changed: 3 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.1
5+
controller-gen.kubebuilder.io/version: v0.17.2
66
name: kueues.operator.openshift.io
77
spec:
88
group: operator.openshift.io
@@ -39,6 +39,7 @@ spec:
3939
metadata:
4040
type: object
4141
spec:
42+
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorSpec'
4243
description: spec holds user settable values for configuration
4344
type: object
4445
required:
@@ -387,152 +388,10 @@ spec:
387388
evicted and requeued in the same cluster queue.
388389
Defaults to 5min.
389390
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
441391
status:
392+
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorStatus'
442393
description: status holds observed values from the cluster. They may not be overridden.
443394
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
536395
served: true
537396
storage: true
538397
subresources:

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

Lines changed: 3 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.2
5+
controller-gen.kubebuilder.io/version: v0.4.1
66
name: kueues.operator.openshift.io
77
spec:
88
group: operator.openshift.io
@@ -39,6 +39,7 @@ spec:
3939
metadata:
4040
type: object
4141
spec:
42+
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorSpec'
4243
description: spec holds user settable values for configuration
4344
type: object
4445
required:
@@ -387,152 +388,10 @@ spec:
387388
evicted and requeued in the same cluster queue.
388389
Defaults to 5min.
389390
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
441391
status:
392+
$ref: '#/definitions/github.com~1openshift~1api~1operator~1v1~0OperatorStatus'
442393
description: status holds observed values from the cluster. They may not be overridden.
443394
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
536395
served: true
537396
storage: true
538397
subresources:

‎go.mod‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,19 @@ go 1.23.0
44

55
toolchain go1.23.4
66

7+
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250218152928-be0dbe446d10
8+
79
require (
810
github.com/google/go-cmp v0.6.0
911
github.com/onsi/ginkgo/v2 v2.22.2
1012
github.com/onsi/gomega v1.36.2
11-
github.com/openshift/api v0.0.0-20250131134714-405421854f2b
13+
github.com/openshift/api v0.0.0-20250305225826-b8da3bfeaf77
1214
github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2
1315
github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a
1416
github.com/openshift/library-go v0.0.0-20250228164547-bad2d1bf3a37
1517
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
1618
github.com/prometheus/client_golang v1.20.5
17-
github.com/spf13/cobra v1.8.1
19+
github.com/spf13/cobra v1.9.1
1820
k8s.io/api v0.32.2
1921
k8s.io/apiextensions-apiserver v0.32.2
2022
k8s.io/apimachinery v0.32.2
@@ -23,7 +25,7 @@ require (
2325
k8s.io/component-base v0.32.2
2426
k8s.io/klog/v2 v2.130.1
2527
k8s.io/utils v0.0.0-20241210054802-24370beab758
26-
sigs.k8s.io/controller-tools v0.17.2
28+
sigs.k8s.io/controller-tools v0.4.1
2729
sigs.k8s.io/kueue v0.10.2
2830
sigs.k8s.io/structured-merge-diff/v4 v4.4.3
2931
sigs.k8s.io/yaml v1.4.0
@@ -101,15 +103,15 @@ require (
101103
go.uber.org/zap v1.27.0 // indirect
102104
golang.org/x/crypto v0.36.0 // indirect
103105
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
104-
golang.org/x/mod v0.22.0 // indirect
106+
golang.org/x/mod v0.23.0 // indirect
105107
golang.org/x/net v0.37.0 // indirect
106108
golang.org/x/oauth2 v0.23.0 // indirect
107109
golang.org/x/sync v0.12.0 // indirect
108110
golang.org/x/sys v0.31.0 // indirect
109111
golang.org/x/term v0.30.0 // indirect
110112
golang.org/x/text v0.23.0 // indirect
111113
golang.org/x/time v0.7.0 // indirect
112-
golang.org/x/tools v0.29.0 // indirect
114+
golang.org/x/tools v0.30.0 // indirect
113115
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
114116
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
115117
google.golang.org/grpc v1.65.0 // indirect

0 commit comments

Comments
 (0)