From ce61d0ae80e76c557714dc839a039b8d1a40438a Mon Sep 17 00:00:00 2001 From: Bryce Palmer Date: Thu, 20 Feb 2025 16:41:42 -0500 Subject: [PATCH] fixup! don't allow setting revisions Signed-off-by: Bryce Palmer --- .../generated_openapi/zz_generated.openapi.go | 4 +- openapi/openapi.json | 4 +- .../AAA_ungated.yaml | 80 ++++--------------- operator/v1/types.go | 8 +- ..._12_etcd_01_etcds-CustomNoUpgrade.crd.yaml | 16 ++-- .../0000_12_etcd_01_etcds-Default.crd.yaml | 16 ++-- ...etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml | 16 ++-- ...tcd_01_etcds-TechPreviewNoUpgrade.crd.yaml | 16 ++-- ..._kube-apiserver_01_kubeapiservers.crd.yaml | 16 ++-- ...manager_01_kubecontrollermanagers.crd.yaml | 16 ++-- ..._kube-scheduler_01_kubeschedulers.crd.yaml | 16 ++-- .../AAA_ungated.yaml | 16 ++-- .../EtcdBackendQuota.yaml | 16 ++-- .../HardwareSpeed.yaml | 16 ++-- .../AAA_ungated.yaml | 16 ++-- .../AAA_ungated.yaml | 16 ++-- .../AAA_ungated.yaml | 16 ++-- .../v1/zz_generated.swagger_doc_generated.go | 4 +- ..._12_etcd_01_etcds-CustomNoUpgrade.crd.yaml | 16 ++-- .../0000_12_etcd_01_etcds-Default.crd.yaml | 16 ++-- ...etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml | 16 ++-- ...tcd_01_etcds-TechPreviewNoUpgrade.crd.yaml | 16 ++-- ..._kube-apiserver_01_kubeapiservers.crd.yaml | 16 ++-- ...manager_01_kubecontrollermanagers.crd.yaml | 16 ++-- ..._kube-scheduler_01_kubeschedulers.crd.yaml | 16 ++-- 25 files changed, 146 insertions(+), 274 deletions(-) diff --git a/openapi/generated_openapi/zz_generated.openapi.go b/openapi/generated_openapi/zz_generated.openapi.go index 94b384a302b..82e7c317187 100644 --- a/openapi/generated_openapi/zz_generated.openapi.go +++ b/openapi/generated_openapi/zz_generated.openapi.go @@ -52685,14 +52685,14 @@ func schema_openshift_api_operator_v1_NodeStatus(ref common.ReferenceCallback) c }, "currentRevision": { SchemaProps: spec.SchemaProps{ - Description: "currentRevision is the generation of the most recently successful deployment. If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value.", + Description: "currentRevision is the generation of the most recently successful deployment. Can not be set on creation of a nodeStatus. Updates must only increase the value.", Type: []string{"integer"}, Format: "int32", }, }, "targetRevision": { SchemaProps: spec.SchemaProps{ - Description: "targetRevision is the generation of the deployment we're trying to apply. If set on creation of a nodeStatus, it must be set to 0.", + Description: "targetRevision is the generation of the deployment we're trying to apply. Can not be set on creation of a nodeStatus.", Type: []string{"integer"}, Format: "int32", }, diff --git a/openapi/openapi.json b/openapi/openapi.json index 16007ab4100..596e510f308 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -30740,7 +30740,7 @@ ], "properties": { "currentRevision": { - "description": "currentRevision is the generation of the most recently successful deployment. If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value.", + "description": "currentRevision is the generation of the most recently successful deployment. Can not be set on creation of a nodeStatus. Updates must only increase the value.", "type": "integer", "format": "int32" }, @@ -30782,7 +30782,7 @@ "default": "" }, "targetRevision": { - "description": "targetRevision is the generation of the deployment we're trying to apply. If set on creation of a nodeStatus, it must be set to 0.", + "description": "targetRevision is the generation of the deployment we're trying to apply. Can not be set on creation of a nodeStatus.", "type": "integer", "format": "int32" } diff --git a/operator/v1/tests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml b/operator/v1/tests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml index e62d984a308..7589d4d2bae 100644 --- a/operator/v1/tests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml +++ b/operator/v1/tests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml @@ -16,6 +16,9 @@ tests: operatorLogLevel: Normal onUpdate: - name: Should reject multiple nodes with nonzero target revisions + initialCRDPatches: + - op: remove + path: /spec/versions/0/schema/openAPIV3Schema/properties/status/properties/nodeStatuses/items/x-kubernetes-validations/2 initial: | apiVersion: operator.openshift.io/v1 kind: KubeAPIServer @@ -43,6 +46,9 @@ tests: - nodeName: d expectedStatusError: "status.nodeStatuses: Invalid value: \"array\": no more than 1 node status may have a nonzero targetRevision" - name: Should reject decreasing currentRevision + initialCRDPatches: + - op: remove + path: /spec/versions/0/schema/openAPIV3Schema/properties/status/properties/nodeStatuses/items/x-kubernetes-validations/1 initial: | apiVersion: operator.openshift.io/v1 kind: KubeAPIServer @@ -50,7 +56,7 @@ tests: status: nodeStatuses: - nodeName: a - currentRevision: 0 + currentRevision: 3 updated: | apiVersion: operator.openshift.io/v1 kind: KubeAPIServer @@ -58,7 +64,7 @@ tests: status: nodeStatuses: - nodeName: a - currentRevision: -1 + currentRevision: 2 expectedStatusError: "status.nodeStatuses[0].currentRevision: Invalid value: \"integer\": must only increase" - name: Should reject clearing currentRevision initialCRDPatches: @@ -80,7 +86,7 @@ tests: nodeStatuses: - nodeName: a expectedStatusError: "status.nodeStatuses[0].currentRevision: Invalid value: \"object\": cannot be unset once set" - - name: Should reject setting new nodeStatus with a non-zero currentRevision + - name: Should reject setting new nodeStatus with a currentRevision initial: | apiVersion: operator.openshift.io/v1 kind: KubeAPIServer @@ -94,9 +100,9 @@ tests: status: nodeStatuses: - nodeName: a - currentRevision: 3 - expectedStatusError: "status.nodeStatuses[0]: Invalid value: \"object\": when specified on creation of a nodeStatus, currentRevision must be set to 0" - - name: Should reject setting new nodeStatus with a non-zero targetRevision + currentRevision: 0 + expectedStatusError: "status.nodeStatuses[0]: Invalid value: \"object\": currentRevision can not be set on creation of a nodeStatus" + - name: Should reject setting new nodeStatus with a targetRevision initial: | apiVersion: operator.openshift.io/v1 kind: KubeAPIServer @@ -110,8 +116,8 @@ tests: status: nodeStatuses: - nodeName: a - targetRevision: 3 - expectedStatusError: "status.nodeStatuses[0]: Invalid value: \"object\": when specified on creation of a nodeStatus, targetRevision must be set to 0" + targetRevision: 0 + expectedStatusError: "status.nodeStatuses[0]: Invalid value: \"object\": targetRevision can not be set on creation of a nodeStatus" - name: Should allow adding nodes with name only initial: | apiVersion: operator.openshift.io/v1 @@ -138,61 +144,7 @@ tests: nodeStatuses: - nodeName: a - nodeName: b - - name: Should allow updating currentRevision of existing nodeStatus that specified a currentRevision on creation - initial: | - apiVersion: operator.openshift.io/v1 - kind: KubeAPIServer - spec: {} # No spec is required for a KubeAPIServer - status: - nodeStatuses: - - nodeName: a - currentRevision: 0 - updated: | - apiVersion: operator.openshift.io/v1 - kind: KubeAPIServer - spec: {} # No spec is required for a KubeAPIServer - status: - nodeStatuses: - - nodeName: a - currentRevision: 1 - expected: | - apiVersion: operator.openshift.io/v1 - kind: KubeAPIServer - spec: - logLevel: Normal - operatorLogLevel: Normal - status: - nodeStatuses: - - nodeName: a - currentRevision: 1 - - name: Should allow updating targetRevision of existing nodeStatus that specified a targetRevision on creation - initial: | - apiVersion: operator.openshift.io/v1 - kind: KubeAPIServer - spec: {} # No spec is required for a KubeAPIServer - status: - nodeStatuses: - - nodeName: a - targetRevision: 0 - updated: | - apiVersion: operator.openshift.io/v1 - kind: KubeAPIServer - spec: {} # No spec is required for a KubeAPIServer - status: - nodeStatuses: - - nodeName: a - targetRevision: 1 - expected: | - apiVersion: operator.openshift.io/v1 - kind: KubeAPIServer - spec: - logLevel: Normal - operatorLogLevel: Normal - status: - nodeStatuses: - - nodeName: a - targetRevision: 1 - - name: Should allow updating currentRevision of existing nodeStatus that did not specify a currentRevision on creation + - name: Should allow updating currentRevision of existing nodeStatus initial: | apiVersion: operator.openshift.io/v1 kind: KubeAPIServer @@ -218,7 +170,7 @@ tests: nodeStatuses: - nodeName: a currentRevision: 1 - - name: Should allow updating targetRevision of existing nodeStatus that did not specify a targetRevision on creation + - name: Should allow updating targetRevision of existing nodeStatus initial: | apiVersion: operator.openshift.io/v1 kind: KubeAPIServer diff --git a/operator/v1/types.go b/operator/v1/types.go index 8814e179a23..2f4c9c4c5a0 100644 --- a/operator/v1/types.go +++ b/operator/v1/types.go @@ -258,20 +258,20 @@ type StaticPodOperatorStatus struct { // NodeStatus provides information about the current state of a particular node managed by this operator. // +kubebuilder:validation:XValidation:rule="has(self.currentRevision) || !has(oldSelf.currentRevision)",message="cannot be unset once set",fieldPath=".currentRevision" -// +kubebuilder:validation:XValidation:rule="oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision == 0 : true) ",message="when specified on creation of a nodeStatus, currentRevision must be set to 0",optionalOldSelf=true -// +kubebuilder:validation:XValidation:rule="oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision == 0 : true) ",message="when specified on creation of a nodeStatus, targetRevision must be set to 0",optionalOldSelf=true +// +kubebuilder:validation:XValidation:rule="oldSelf.hasValue() || !has(self.currentRevision)",message="currentRevision can not be set on creation of a nodeStatus",optionalOldSelf=true +// +kubebuilder:validation:XValidation:rule="oldSelf.hasValue() || !has(self.targetRevision)",message="targetRevision can not be set on creation of a nodeStatus",optionalOldSelf=true type NodeStatus struct { // nodeName is the name of the node // +required NodeName string `json:"nodeName"` // currentRevision is the generation of the most recently successful deployment. - // If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + // Can not be set on creation of a nodeStatus. Updates must only increase the value. // +kubebuilder:validation:XValidation:rule="self >= oldSelf",message="must only increase" // +optional CurrentRevision int32 `json:"currentRevision,omitempty"` // targetRevision is the generation of the deployment we're trying to apply. - // If set on creation of a nodeStatus, it must be set to 0. + // Can not be set on creation of a nodeStatus. // +optional TargetRevision int32 `json:"targetRevision,omitempty"` diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml index d4f41995efa..5c08eb4ba1b 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml @@ -254,7 +254,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -295,7 +295,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -305,16 +305,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml index f63f86bea68..9a332d565f4 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml @@ -241,7 +241,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -282,7 +282,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -292,16 +292,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml index 8bdb7e58cfe..e92b2be6b1b 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml @@ -254,7 +254,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -295,7 +295,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -305,16 +305,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml index c2dcb8c5607..458dfe534a7 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml @@ -254,7 +254,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -295,7 +295,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -305,16 +305,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml index ba0a5bce980..a9a107b3f74 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml @@ -223,7 +223,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -264,7 +264,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -274,16 +274,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml index c6da33a8d04..af66b058ea3 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml @@ -232,7 +232,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -273,7 +273,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -283,16 +283,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.crd-manifests/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml b/operator/v1/zz_generated.crd-manifests/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml index 28416ae653b..192c3562be5 100644 --- a/operator/v1/zz_generated.crd-manifests/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml +++ b/operator/v1/zz_generated.crd-manifests/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml @@ -223,7 +223,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -264,7 +264,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -274,16 +274,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yaml index a2c6048562b..8a28ebf7676 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yaml @@ -228,7 +228,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -269,7 +269,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -279,16 +279,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml index 9438a1086df..dc749c411bc 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml @@ -241,7 +241,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -282,7 +282,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -292,16 +292,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/HardwareSpeed.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/HardwareSpeed.yaml index 86e88c41f77..1008839ef78 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/HardwareSpeed.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/HardwareSpeed.yaml @@ -241,7 +241,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -282,7 +282,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -292,16 +292,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml index 6d5b098f642..90135f5bf20 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml @@ -224,7 +224,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -265,7 +265,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -275,16 +275,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yaml index 0f32b99dc86..afe514a8b35 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yaml @@ -233,7 +233,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -274,7 +274,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -284,16 +284,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yaml b/operator/v1/zz_generated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yaml index 04d730785d0..6341149bfce 100644 --- a/operator/v1/zz_generated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yaml +++ b/operator/v1/zz_generated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yaml @@ -224,7 +224,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -265,7 +265,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -275,16 +275,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go index 677c3373c88..75448ecd457 100644 --- a/operator/v1/zz_generated.swagger_doc_generated.go +++ b/operator/v1/zz_generated.swagger_doc_generated.go @@ -37,8 +37,8 @@ func (MyOperatorResource) SwaggerDoc() map[string]string { var map_NodeStatus = map[string]string{ "": "NodeStatus provides information about the current state of a particular node managed by this operator.", "nodeName": "nodeName is the name of the node", - "currentRevision": "currentRevision is the generation of the most recently successful deployment. If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value.", - "targetRevision": "targetRevision is the generation of the deployment we're trying to apply. If set on creation of a nodeStatus, it must be set to 0.", + "currentRevision": "currentRevision is the generation of the most recently successful deployment. Can not be set on creation of a nodeStatus. Updates must only increase the value.", + "targetRevision": "targetRevision is the generation of the deployment we're trying to apply. Can not be set on creation of a nodeStatus.", "lastFailedRevision": "lastFailedRevision is the generation of the deployment we tried and failed to deploy.", "lastFailedTime": "lastFailedTime is the time the last failed revision failed the last time.", "lastFailedReason": "lastFailedReason is a machine readable failure reason string.", diff --git a/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml b/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml index d4f41995efa..5c08eb4ba1b 100644 --- a/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_12_etcd_01_etcds-CustomNoUpgrade.crd.yaml @@ -254,7 +254,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -295,7 +295,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -305,16 +305,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/payload-manifests/crds/0000_12_etcd_01_etcds-Default.crd.yaml b/payload-manifests/crds/0000_12_etcd_01_etcds-Default.crd.yaml index f63f86bea68..9a332d565f4 100644 --- a/payload-manifests/crds/0000_12_etcd_01_etcds-Default.crd.yaml +++ b/payload-manifests/crds/0000_12_etcd_01_etcds-Default.crd.yaml @@ -241,7 +241,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -282,7 +282,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -292,16 +292,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml index 8bdb7e58cfe..e92b2be6b1b 100644 --- a/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml @@ -254,7 +254,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -295,7 +295,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -305,16 +305,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml b/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml index c2dcb8c5607..458dfe534a7 100644 --- a/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml +++ b/payload-manifests/crds/0000_12_etcd_01_etcds-TechPreviewNoUpgrade.crd.yaml @@ -254,7 +254,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -295,7 +295,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -305,16 +305,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml b/payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml index ba0a5bce980..a9a107b3f74 100644 --- a/payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml +++ b/payload-manifests/crds/0000_20_kube-apiserver_01_kubeapiservers.crd.yaml @@ -223,7 +223,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -264,7 +264,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -274,16 +274,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/payload-manifests/crds/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml b/payload-manifests/crds/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml index c6da33a8d04..af66b058ea3 100644 --- a/payload-manifests/crds/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml +++ b/payload-manifests/crds/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml @@ -232,7 +232,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -273,7 +273,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -283,16 +283,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName diff --git a/payload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml b/payload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml index 28416ae653b..192c3562be5 100644 --- a/payload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml +++ b/payload-manifests/crds/0000_25_kube-scheduler_01_kubeschedulers.crd.yaml @@ -223,7 +223,7 @@ spec: currentRevision: description: |- currentRevision is the generation of the most recently successful deployment. - If set on creation of a nodeStatus, it must be set to 0. Updates must only increase the value. + Can not be set on creation of a nodeStatus. Updates must only increase the value. format: int32 type: integer x-kubernetes-validations: @@ -264,7 +264,7 @@ spec: targetRevision: description: |- targetRevision is the generation of the deployment we're trying to apply. - If set on creation of a nodeStatus, it must be set to 0. + Can not be set on creation of a nodeStatus. format: int32 type: integer required: @@ -274,16 +274,12 @@ spec: - fieldPath: .currentRevision message: cannot be unset once set rule: has(self.currentRevision) || !has(oldSelf.currentRevision) - - message: when specified on creation of a nodeStatus, currentRevision - must be set to 0 + - message: currentRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.currentRevision) ? self.currentRevision - == 0 : true) ' - - message: when specified on creation of a nodeStatus, targetRevision - must be set to 0 + rule: oldSelf.hasValue() || !has(self.currentRevision) + - message: targetRevision can not be set on creation of a nodeStatus optionalOldSelf: true - rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision - == 0 : true) ' + rule: oldSelf.hasValue() || !has(self.targetRevision) type: array x-kubernetes-list-map-keys: - nodeName