fixup! better message

Signed-off-by: Bryce Palmer <[email protected]>
openshift · Feb 19, 2025 · 1b31db9 · 1b31db9
1 parent 1547ebd
commit 1b31db9
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 44 deletions.
diff --git a/operator/v1/tests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml b/operator/v1/tests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml
@@ -95,7 +95,7 @@ tests:
           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 on creation"
+      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
       initial: |
         apiVersion: operator.openshift.io/v1
@@ -111,7 +111,7 @@ tests:
           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 on creation"
+      expectedStatusError: "status.nodeStatuses[0]: Invalid value: \"object\": when specified on creation of a nodeStatus, targetRevision must be set to 0"
     - name: Should allow adding nodes with name only
       initial: |
         apiVersion: operator.openshift.io/v1

diff --git a/operator/v1/types.go b/operator/v1/types.go
@@ -258,8 +258,8 @@ 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 on creation",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 on creation",optionalOldSelf=true
+// +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
 type NodeStatus struct {
 	// nodeName is the name of the node
 	// +required

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
@@ -306,12 +306,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -293,12 +293,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -306,12 +306,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -306,12 +306,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -275,12 +275,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

diff --git a/...enerated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml b/...enerated.crd-manifests/0000_25_kube-controller-manager_01_kubecontrollermanagers.crd.yaml
@@ -284,12 +284,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -275,12 +275,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

diff --git a/...r/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yaml b/...r/v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/AAA_ungated.yaml
@@ -280,12 +280,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

diff --git a/...zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml b/...zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/EtcdBackendQuota.yaml
@@ -293,12 +293,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

diff --git a/...v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/HardwareSpeed.yaml b/...v1/zz_generated.featuregated-crd-manifests/etcds.operator.openshift.io/HardwareSpeed.yaml
@@ -293,12 +293,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

diff --git a/...enerated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml b/...enerated.featuregated-crd-manifests/kubeapiservers.operator.openshift.io/AAA_ungated.yaml
@@ -276,12 +276,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

diff --git a/....featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yaml b/....featuregated-crd-manifests/kubecontrollermanagers.operator.openshift.io/AAA_ungated.yaml
@@ -285,12 +285,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

diff --git a/...enerated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yaml b/...enerated.featuregated-crd-manifests/kubeschedulers.operator.openshift.io/AAA_ungated.yaml
@@ -276,12 +276,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -306,12 +306,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -293,12 +293,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -306,12 +306,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -306,12 +306,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -275,12 +275,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -284,12 +284,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '

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
@@ -275,12 +275,12 @@ spec:
                     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 on creation
+                      must be set to 0
                     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 on creation
+                      must be set to 0
                     optionalOldSelf: true
                     rule: 'oldSelf.hasValue() || (has(self.targetRevision) ? self.targetRevision
                       == 0 : true) '