From ec3b12c01b2756bef0219d08111266b2fb1aa1a0 Mon Sep 17 00:00:00 2001 From: rabi Date: Mon, 20 Jan 2025 10:36:23 +0530 Subject: [PATCH] Remove CRD schema checker override Also, fixes a comment. --- controllers/dataplane/openstackdataplanenodeset_controller.go | 4 ++-- hack/crd-schema-checker.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/controllers/dataplane/openstackdataplanenodeset_controller.go b/controllers/dataplane/openstackdataplanenodeset_controller.go index 3381795f9..7bc185612 100644 --- 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 index 25ac2f236..a5c9a9539 100755 --- 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