[4.3] WIP: Add OpenAPIv3 Validation to CRDs

Gopkg.toml

@@ -40,20 +40,20 @@ required = [
     unused-packages = false
 
 [[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "v1.3.0"
+  name = "github.com/apparentlymart/go-cidr"
+  version = "1.0.0"
 
 [[constraint]]
-  name = "github.com/apparentlymart/go-cidr"
+  name = "github.com/ashcrow/osrelease"
   version = "1.0.0"
 
 [[constraint]]
-  name = "github.com/google/renameio"
-  version = "v0.1.0"
+  name = "github.com/containers/image"
+  version = "v2.0.0"
 
 [[constraint]]
-  name = "github.com/ashcrow/osrelease"
-  version = "1.0.0"
+  name = "github.com/containers/storage"
+  revision = "0b67c788f2d234c9fecc3d372d93160869381166"
 
 [[constraint]]
   name = "github.com/coreos/container-linux-config-transpiler"
@@ -71,6 +71,10 @@ required = [
   name = "github.com/golang/glog"
   revision = "44145f04b68cf362d9c4df2182967c2275eaefed"
 
+[[constraint]]
+  name = "github.com/google/renameio"
+  version = "v0.1.0"
+
 [[constraint]]
   name = "github.com/Masterminds/sprig"
   version = "v2.15.0"
@@ -95,6 +99,10 @@ required = [
   name = "github.com/spf13/cobra"
   version = "v0.0.3"
 
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "v1.3.0"
+
 [[constraint]]
   name = "github.com/vincent-petithory/dataurl"
   revision = "9a301d65acbb728fcc3ace14f45f511a4cfeea9c"
@@ -144,18 +152,12 @@ required = [
   name = "k8s.io/apimachinery"
   version = "kubernetes-1.14.0"
 
+# TODO: include why the override is required
 [[override]]
   name = "k8s.io/apiserver"
   version = "kubernetes-1.14.0"
 
-[[constraint]]
-  revision = "0b67c788f2d234c9fecc3d372d93160869381166"
-  name = "github.com/containers/storage"
-
+# TODO: include why the override is required
 [[override]]
   name = "github.com/opencontainers/runtime-spec"
   revision = "29686dbc5559d93fb1ef402eeda3e35c38d75af4"
-
-[[constraint]]
-  name = "github.com/containers/image"
-  version = "v2.0.0"

Makefile

@@ -34,25 +34,36 @@ test: test-unit test-e2e
 test-unit:
 	go test -count=1 -v ./cmd/... ./pkg/... ./lib/...
 
-# Run the code generation tasks.
-# Example:
-#    make update
-update: install-go-bindata
-	hack/update-codegen.sh
-	hack/update-generated-bindata.sh
+# Install build and test dependencies
+CRD_SCHEMA_GEN_VERSION := v1.0.0
+install-crd-schema-gen:
+	git clone -b $(CRD_SCHEMA_GEN_VERSION) --single-branch --depth 1 https://github.com/openshift/crd-schema-gen.git $(CRD_SCHEMA_GEN_GOPATH)/src/github.com/openshift/crd-schema-gen
+	GOPATH=$(CRD_SCHEMA_GEN_GOPATH) GOBIN=$(CRD_SCHEMA_GEN_GOPATH)/bin go install $(CRD_SCHEMA_GEN_GOPATH)/src/github.com/openshift/crd-schema-gen/cmd/crd-schema-gen
 
 install-go-bindata:
 	hack/install-go-bindata.sh
 
-install-tools: install-go-bindata
+install-tools: install-go-bindata 
 	# mktemp -d is required to avoid the creation of go modules related files in the project root
 	cd $(shell mktemp -d) && GO111MODULE=on go get github.com/securego/gosec/cmd/gosec@4b59c948083cd711b6a8aac8f32721b164899f57
 	cd $(shell mktemp -d) && GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1
 
-# Run verification steps
-# Example:
-#    make verify
-verify: install-tools
+# Run the code generation tasks.
+update-codegen:
+	hack/update-codegen.sh
+
+update-crds: CRD_SCHEMA_GEN_GOPATH :=$(shell mktemp -d)
+update-crds: install-crd-schema-gen
+	$(CRD_SCHEMA_GEN_GOPATH)/bin/crd-schema-gen --apis-dir pkg/apis/machineconfiguration.openshift.io/v1 --manifests-dir manifests --output-dir manifests
+
+update: install-tools update-codegen update-crds
+	hack/update-generated-bindata.sh
+
+verify-crds: CRD_SCHEMA_GEN_GOPATH :=$(shell mktemp -d)
+verify-crds: install-crd-schema-gen
+	$(CRD_SCHEMA_GEN_GOPATH)/bin/crd-schema-gen --apis-dir pkg/apis/machineconfiguration.openshift.io/v1 --manifests-dir manifests --verify-only
+
+verify: install-tools verify-crds
 	golangci-lint run
 	# Remove once https://github.com/golangci/golangci-lint/issues/597 is
 	# addressed

install/0000_80_machine-config-operator_00_clusterreader_clusterrole.yaml

@@ -12,7 +12,6 @@ rules:
       - controllerconfigs
       - kubeletconfigs
       - machineconfigpools
-      - mcoconfigs
     verbs:
       - get
       - list