Skip to content

OCPBUGS-85102: Add labelSelector to MachineSet status for scale subresource #2831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RadekManak wants to merge 1 commit into
base: release-4.22
Choose a base branch
from
Open

OCPBUGS-85102: Add labelSelector to MachineSet status for scale subresource #2831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions machine/v1beta1/types_machineset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ type MachineSetStatus struct {
// observedGeneration reflects the generation of the most recently observed MachineSet.
// +optional
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
// labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
// It is exposed via the scale subresource as status.selector.
// When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
// When present, it must not be empty and must not exceed 4096 characters.
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:MaxLength=4096
// +optional
LabelSelector string `json:"labelSelector,omitempty"`
// In the event that there is a terminal problem reconciling the
// replicas, both ErrorReason and ErrorMessage will be set. ErrorReason
// will be populated with a succinct value suitable for machine
Expand Down
9 changes: 9 additions & 0 deletions ...a1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,15 @@ spec:
labels of the machine template of the MachineSet.
format: int32
type: integer
labelSelector:
description: |-
labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
It is exposed via the scale subresource as status.selector.
When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
When present, it must not be empty and must not exceed 4096 characters.
maxLength: 4096
minLength: 1
type: string
observedGeneration:
description: observedGeneration reflects the generation of the most
recently observed MachineSet.
Expand Down
9 changes: 9 additions & 0 deletions ...ne/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,15 @@ spec:
labels of the machine template of the MachineSet.
format: int32
type: integer
labelSelector:
description: |-
labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
It is exposed via the scale subresource as status.selector.
When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
When present, it must not be empty and must not exceed 4096 characters.
maxLength: 4096
minLength: 1
type: string
observedGeneration:
description: observedGeneration reflects the generation of the most
recently observed MachineSet.
Expand Down
9 changes: 9 additions & 0 deletions ...z_generated.crd-manifests/0000_10_machine-api_01_machinesets-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,15 @@ spec:
labels of the machine template of the MachineSet.
format: int32
type: integer
labelSelector:
description: |-
labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
It is exposed via the scale subresource as status.selector.
When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
When present, it must not be empty and must not exceed 4096 characters.
maxLength: 4096
minLength: 1
type: string
observedGeneration:
description: observedGeneration reflects the generation of the most
recently observed MachineSet.
Expand Down
9 changes: 9 additions & 0 deletions machine/v1beta1/zz_generated.crd-manifests/0000_10_machine-api_01_machinesets-OKD.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,15 @@ spec:
labels of the machine template of the MachineSet.
format: int32
type: integer
labelSelector:
description: |-
labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
It is exposed via the scale subresource as status.selector.
When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
When present, it must not be empty and must not exceed 4096 characters.
maxLength: 4096
minLength: 1
type: string
observedGeneration:
description: observedGeneration reflects the generation of the most
recently observed MachineSet.
Expand Down
9 changes: 9 additions & 0 deletions ..._generated.crd-manifests/0000_10_machine-api_01_machinesets-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,15 @@ spec:
labels of the machine template of the MachineSet.
format: int32
type: integer
labelSelector:
description: |-
labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
It is exposed via the scale subresource as status.selector.
When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
When present, it must not be empty and must not exceed 4096 characters.
maxLength: 4096
minLength: 1
type: string
observedGeneration:
description: observedGeneration reflects the generation of the most
recently observed MachineSet.
Expand Down
9 changes: 9 additions & 0 deletions ...zz_generated.featuregated-crd-manifests/machinesets.machine.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,15 @@ spec:
labels of the machine template of the MachineSet.
format: int32
type: integer
labelSelector:
description: |-
labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
It is exposed via the scale subresource as status.selector.
When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
When present, it must not be empty and must not exceed 4096 characters.
maxLength: 4096
minLength: 1
type: string
observedGeneration:
description: observedGeneration reflects the generation of the most
recently observed MachineSet.
Expand Down
9 changes: 9 additions & 0 deletions ...ated.featuregated-crd-manifests/machinesets.machine.openshift.io/MachineAPIMigration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,15 @@ spec:
labels of the machine template of the MachineSet.
format: int32
type: integer
labelSelector:
description: |-
labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet.
It is exposed via the scale subresource as status.selector.
When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector.
When present, it must not be empty and must not exceed 4096 characters.
maxLength: 4096
minLength: 1
type: string
observedGeneration:
description: observedGeneration reflects the generation of the most
recently observed MachineSet.
Expand Down
1 change: 1 addition & 0 deletions machine/v1beta1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37768,6 +37768,10 @@
"type": "integer",
"format": "int32"
},
"labelSelector": {
"description": "labelSelector is a label selector, in string format, for Machines corresponding to the MachineSet. It is exposed via the scale subresource as status.selector. When omitted, the MachineSet controller has not yet reconciled spec.selector into status.labelSelector. When present, it must not be empty and must not exceed 4096 characters.",
"type": "string"
},
"observedGeneration": {
"description": "observedGeneration reflects the generation of the most recently observed MachineSet.",
"type": "integer",
Expand Down Expand Up @@ -48384,7 +48388,10 @@
"default": {},
"$ref": "#/definitions/com.github.openshift.api.operator.v1alpha1.ClusterAPIInstallerRevisionManifestSubstitution"
},
"x-kubernetes-list-type": "atomic"
"x-kubernetes-list-map-keys": [
"key"
],
"x-kubernetes-list-type": "map"
},
"name": {
"description": "name is the name of a revision.",
Expand Down Expand Up @@ -48488,7 +48495,7 @@
"type": "string"
},
"observedRevisionGeneration": {
"description": "observedRevisionGeneration is the generation of the ClusterAPI object that was last observed by the revision controller. If specified it must be greater than or equal to 1. It may not decrease or be unset once set.",
"description": "observedRevisionGeneration is the generation of the ClusterAPI object that was last observed by the revision controller. If specified it must be greater than or equal to 1, and less than 2^53. It may not decrease or be unset once set.",
"type": "integer",
"format": "int64"
},
Expand Down