Merge pull request #266 from sttts/sttts-api-crd

Replace ClusterVersions CRD with openshift/api artifact

Author: openshift-merge-robot

Dockerfile

@@ -6,5 +6,7 @@ RUN hack/build-go.sh
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 COPY --from=builder /go/src/github.com/openshift/cluster-version-operator/_output/linux/amd64/cluster-version-operator /usr/bin/
 COPY install /manifests
+COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/
+COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml /manifests/
 COPY bootstrap /bootstrap
 ENTRYPOINT ["/usr/bin/cluster-version-operator"]

Dockerfile.rhel7

@@ -8,5 +8,7 @@ RUN hack/build-go.sh; \
 FROM registry.svc.ci.openshift.org/ocp/4.0:base
 COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
 COPY install /manifests
+COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml /manifests/
+COPY vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml /manifests/
 COPY bootstrap /bootstrap
 ENTRYPOINT ["/usr/bin/cluster-version-operator"]

Gopkg.lock

@@ -20,6 +20,10 @@ required = [ "k8s.io/code-generator/cmd/client-gen", "k8s.io/gengo/types" ]
   non-go = false
   unused-packages = false
 
+[[prune.project]]
+  name = "github.com/openshift/api"
+  non-go = false
+
 [[constraint]]
   name = "github.com/google/uuid"
   version = "v1.1.1"

Gopkg.toml

@@ -24,8 +24,8 @@ func main() {
 
 	client := apiext.NewForConfigOrDie(cfg)
 	for _, path := range []string{
-		"install/0000_00_cluster-version-operator_01_clusterversion.crd.yaml",
-		"install/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml",
+		"vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml",
+		"vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml",
 	} {
 		var name string
 		err := wait.PollImmediate(time.Second, 30*time.Second, func() (bool, error) {