Alibaba: fix kubebuilder validation

[patrickdillon]

DiskCategory validation had string type instead of enum.

On master without this change:

$ go generate ./pkg/types/installconfig.go
github.com/openshift/installer/pkg/types:-: conflicting types in allOf branches in schema: string vs DiskCategory
github.com/openshift/installer/pkg/types:-: conflicting types in allOf branches in schema: string vs DiskCategory
github.com/openshift/installer/pkg/types:-: conflicting types in allOf branches in schema: string vs DiskCategory
Error: not all generators ran successfully
run `controller-gen crd:crdVersions=v1 paths=. output:dir=../../data/data/ -w` to see all available markers, or `controller-gen crd:crdVersions=v1 paths=. output:dir=../../data/data/ -h` for usage
exit status 1
pkg/types/installconfig.go:67: running "go": exit status 1

[kwoodson]

@patrickdillon Thanks for this. I haven't seen this. Am I missing a step when I build my clusters?

[patrickdillon]

@patrickdillon Thanks for this. I haven't seen this. Am I missing a step when I build my clusters?

@kwoodson no this is only an error when generating new code for openshift-install explain

[patrickdillon]

We should figure out how this managed to get through CI

[clnperez]

i think just

diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
index 58336a517..6db1faf2f 100755
--- a/hack/verify-codegen.sh
+++ b/hack/verify-codegen.sh
@@ -3,7 +3,13 @@
 if [ "$IS_CONTAINER" != "" ]; then
   set -x
   go generate ./pkg/types/installconfig.go
+  if [[ $? != 0 ]]; then
+      exit 1
+  fi
   go generate ./pkg/rhcos/ami.go
+  if [[ $? != 0 ]]; then
+      exit 1
+  fi
   set +x
   git diff --exit-code
 else

would fix up the CI loophole. am happy to submit a PR if no one is already on it

[openshift-ci]

@patrickdillon: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-ovirt	bc10512	link	false	/test e2e-ovirt
ci/prow/e2e-openstack	bc10512	link	false	/test e2e-openstack
ci/prow/e2e-crc	bc10512	link	false	/test e2e-crc
ci/prow/e2e-aws-workers-rhel7	bc10512	link	false	/test e2e-aws-workers-rhel7

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[patrickdillon]

would fix up the CI loophole. am happy to submit a PR if no one is already on it

That would be great. Thank you

[clnperez]

submitted that pr, so as soon as this one merges we can merge it

[staebler]

i think just

diff --git a/hack/verify-codegen.sh b/hack/verify-codegen.sh
index 58336a517..6db1faf2f 100755
--- a/hack/verify-codegen.sh
+++ b/hack/verify-codegen.sh
@@ -3,7 +3,13 @@
 if [ "$IS_CONTAINER" != "" ]; then
   set -x
   go generate ./pkg/types/installconfig.go
+  if [[ $? != 0 ]]; then
+      exit 1
+  fi
   go generate ./pkg/rhcos/ami.go
+  if [[ $? != 0 ]]; then
+      exit 1
+  fi
   set +x
   git diff --exit-code
 else

would fix up the CI loophole. am happy to submit a PR if no one is already on it

Or just remove the set -x and set +x. But this would also require fixing the fact that the ./pkg/rhcos/ami.go no longer exists. See https://issues.redhat.com/browse/CORS-1838.

[staebler]

/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• OWNERS [staebler]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[openshift-bot]

/retest-required

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest-required

Please review the full test history for this PR and help us cut down flakes.

[openshift-bot]

/retest-required

Please review the full test history for this PR and help us cut down flakes.