Merge pull request openstack-k8s-operators#1269 from rabi/remove_crd_…

…schema_check_override Remove CRD schema checker override
bshephar · Jan 21, 2025 · e1f2daf · e1f2daf
2 parents 675f136 + ec3b12c
commit e1f2daf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/controllers/dataplane/openstackdataplanenodeset_controller.go b/controllers/dataplane/openstackdataplanenodeset_controller.go
@@ -521,9 +521,9 @@ func checkDeployment(ctx context.Context, helper *helper.Helper,
 				isDeploymentRunning = true
 			} else if deploymentConditions.IsTrue(dataplanev1.NodeSetDeploymentReadyCondition) {
 				// If the nodeset configHash does not match with what's in the deployment and the
-				// generation metadata has changed i.e generation metatdata won't change when
+				// generation metadata has changed (i.e generation metatdata won't change when
 				// fields are removed from the CRD during an update that would not require a new
-				// deployment to run).
+				// deployment to run) asssume nodeset has changed requiring new deployment.
 				if deployment.Status.NodeSetHashes[instance.Name] != instance.Status.ConfigHash &&
 					generationChanged {
 					continue

diff --git a/hack/crd-schema-checker.sh b/hack/crd-schema-checker.sh
@@ -3,8 +3,7 @@ set -euxo pipefail
 
 CHECKER=$INSTALL_DIR/crd-schema-checker
 
-# (TODO) Remove NoFieldRemoval after this PR merges
-DISABLED_VALIDATORS=NoMaps,NoFieldRemoval # TODO: https://issues.redhat.com/browse/OSPRH-12254
+DISABLED_VALIDATORS=NoMaps # TODO: https://issues.redhat.com/browse/OSPRH-12254
 
 CHECKER_ARGS=""
 if [[ ${DISABLED_VALIDATORS:+x} ]]; then