Skip to content

Commit ec3b12c

Browse files
committed
Remove CRD schema checker override
Also, fixes a comment.
1 parent 851e9a2 commit ec3b12c

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

controllers/dataplane/openstackdataplanenodeset_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,9 @@ func checkDeployment(ctx context.Context, helper *helper.Helper,
521521
isDeploymentRunning = true
522522
} else if deploymentConditions.IsTrue(dataplanev1.NodeSetDeploymentReadyCondition) {
523523
// If the nodeset configHash does not match with what's in the deployment and the
524-
// generation metadata has changed i.e generation metatdata won't change when
524+
// generation metadata has changed (i.e generation metatdata won't change when
525525
// fields are removed from the CRD during an update that would not require a new
526-
// deployment to run).
526+
// deployment to run) asssume nodeset has changed requiring new deployment.
527527
if deployment.Status.NodeSetHashes[instance.Name] != instance.Status.ConfigHash &&
528528
generationChanged {
529529
continue

hack/crd-schema-checker.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ set -euxo pipefail
33

44
CHECKER=$INSTALL_DIR/crd-schema-checker
55

6-
# (TODO) Remove NoFieldRemoval after this PR merges
7-
DISABLED_VALIDATORS=NoMaps,NoFieldRemoval # TODO: https://issues.redhat.com/browse/OSPRH-12254
6+
DISABLED_VALIDATORS=NoMaps # TODO: https://issues.redhat.com/browse/OSPRH-12254
87

98
CHECKER_ARGS=""
109
if [[ ${DISABLED_VALIDATORS:+x} ]]; then

0 commit comments

Comments
 (0)