Bug 1785302: Using types from openshift/api repository.

Dockerfile

@@ -6,6 +6,7 @@ RUN make build
 FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
 COPY images/bin/entrypoint.sh /usr/bin/
 COPY manifests/image-references manifests/0* /manifests/
+COPY vendor/github.com/openshift/api/imageregistry/v1/00-crd.yaml /manifests/
 COPY --from=builder /go/src/github.com/openshift/cluster-image-registry-operator/tmp/_output/bin/cluster-image-registry-operator /usr/bin/
 RUN ln /usr/bin/cluster-image-registry-operator /usr/bin/cluster-image-registry-operator-watch && \
     chmod -R g+w /etc/pki/ca-trust/extracted/pem/

Makefile

@@ -2,14 +2,9 @@ IMAGE ?= docker.io/openshift/origin-cluster-image-registry-operator
 TAG ?= latest
 PROG  := cluster-image-registry-operator
 
-all: generate build build-image verify
+all: build build-image verify
 .PHONY: all
 
-generate:
-	./hack/codegen/update-generated.sh
-	./hack/codegen/update-crd.sh
-.PHONY: generate
-
 build:
 	./hack/build/build.sh
 .PHONY: build
@@ -29,13 +24,9 @@ test-e2e:
 	./hack/test-go.sh -count 1 -timeout 2h -v$${WHAT:+ -run="$$WHAT"} ./test/e2e/
 .PHONY: test-e2e
 
-verify: verify-crd verify-fmt verify-sec
+verify: verify-fmt verify-sec
 .PHONY: verify
 
-verify-crd:
-	./hack/codegen/update-crd.sh --verify-only
-.PHONY: verify-crd
-
 verify-fmt:
 	./hack/verify-gofmt.sh
 .PHONY: verify-gofmt

defaults/defaults.go

@@ -0,0 +1,76 @@
+package defaults
+
+const (
+	// RouteName is the name of the default route created for the registry
+	// when a default route is requested from the operator
+	RouteName = "default-route"
+
+	// ImageRegistryName is the name of the image-registry workload resource (deployment)
+	ImageRegistryName = "image-registry"
+
+	// ImageRegistryResourceName is the name of the image registry config instance
+	ImageRegistryResourceName = "cluster"
+
+	// ClusterProxyResourceName is the name of the cluster proxy config instance
+	ClusterProxyResourceName = "cluster"
+
+	// CloudCredentialsName is the name of the cloud credentials secret
+	CloudCredentialsName = "installer-cloud-credentials"
+
+	// ImageRegistryCertificatesName is the name of the configmap that is managed by the
+	// registry operator and mounted into the registry pod, to provide additional
+	// CAs to be trusted during image pullthrough
+	ImageRegistryCertificatesName = "image-registry-certificates"
+
+	// ImageRegistryPrivateConfiguration is the name of a secret that is managed by the
+	// registry operator and which provides credentials to the registry for things like
+	// accessing S3 storage
+	ImageRegistryPrivateConfiguration = "image-registry-private-configuration"
+
+	// ImageRegistryPrivateConfigurationUser is the name of a secret that is managed by
+	// the administrator and which provides credentials to the registry for things like
+	// accessing S3 storage.  This content takes precedence over content the operator
+	// automatically pulls from other locations, and it is merged into ImageRegistryPrivateConfiguration
+	ImageRegistryPrivateConfigurationUser = "image-registry-private-configuration-user"
+
+	// ImageRegistryOperatorNamespace is the namespace containing the registry operator
+	// and the registry itself
+	ImageRegistryOperatorNamespace = "openshift-image-registry"
+
+	// ImageRegistryClusterOperatorResourceName is the name of the clusteroperator resource
+	// that reflects the registry operator status.
+	ImageRegistryClusterOperatorResourceName = "image-registry"
+
+	// Status Conditions
+
+	// OperatorStatusTypeRemoved denotes that the image-registry instance has been
+	// removed
+	OperatorStatusTypeRemoved = "Removed"
+
+	// StorageExists denotes whether or not the registry storage medium exists
+	StorageExists = "StorageExists"
+
+	// StorageTagged denotes whether or not the registry storage medium
+	// that we created was tagged correctly
+	StorageTagged = "StorageTagged"
+
+	// StorageLabeled denotes whether or not the registry storage medium
+	// that we created was labeled correctly
+	StorageLabeled = "StorageLabeled"
+
+	// StorageEncrypted denotes whether or not the registry storage medium
+	// that we created has encryption enabled
+	StorageEncrypted = "StorageEncrypted"
+
+	// StoragePublicAccessBlocked denotes whether or not the registry storage medium
+	// that we created has had public access to itself and its objects blocked
+	StoragePublicAccessBlocked = "StoragePublicAccessBlocked"
+
+	// StorageIncompleteUploadCleanupEnabled denotes whether or not the registry storage
+	// medium is configured to automatically cleanup incomplete uploads
+	StorageIncompleteUploadCleanupEnabled = "StorageIncompleteUploadCleanupEnabled"
+
+	// VersionAnnotation reflects the version of the registry that this deployment
+	// is running.
+	VersionAnnotation = "release.openshift.io/version"
+)

go.mod

@@ -7,80 +7,67 @@ require (
 	github.com/Azure/azure-pipeline-go v0.2.2 // indirect
 	github.com/Azure/azure-sdk-for-go v30.1.0+incompatible
 	github.com/Azure/azure-storage-blob-go v0.7.0
-	github.com/Azure/go-autorest/autorest v0.9.2
-	github.com/Azure/go-autorest/autorest/adal v0.8.0 // indirect
-	github.com/Azure/go-autorest/autorest/azure/auth v0.4.0
+	github.com/Azure/go-autorest/autorest v0.9.3
+	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2
 	github.com/Azure/go-autorest/autorest/to v0.3.0
 	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/aws/aws-sdk-go v1.21.10
-	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/coreos/etcd v3.3.17+incompatible // indirect
 	github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/davecgh/go-spew v1.1.1
 	github.com/emicklei/go-restful v2.11.1+incompatible // indirect
 	github.com/evanphx/json-patch v4.5.0+incompatible // indirect
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-openapi/jsonreference v0.19.3 // indirect
-	github.com/go-openapi/spec v0.19.4 // indirect
+	github.com/go-openapi/spec v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.6 // indirect
 	github.com/gogo/protobuf v1.3.1 // indirect
 	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
-	github.com/google/btree v1.0.0 // indirect
-	github.com/google/go-cmp v0.3.1 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
 	github.com/googleapis/gnostic v0.3.1 // indirect
 	github.com/gophercloud/gophercloud v0.2.1-0.20190725225357-73bf16e49026
 	github.com/gophercloud/utils v0.0.0-20190527093828-25f1b77b8c03
 	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/goware/urlx v0.3.1
 	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.9.5 // indirect
 	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/imdario/mergo v0.3.8 // indirect
-	github.com/json-iterator/go v1.1.8 // indirect
-	github.com/mailru/easyjson v0.7.0 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onsi/ginkgo v1.10.1 // indirect
-	github.com/onsi/gomega v1.7.0 // indirect
-	github.com/openshift/api v3.9.1-0.20191031084152-11eee842dafd+incompatible
-	github.com/openshift/client-go v0.0.0-20191022152013-2823239d2298
+	github.com/onsi/ginkgo v1.10.3 // indirect
+	github.com/onsi/gomega v1.7.1 // indirect
+	github.com/openshift/api v0.0.0-20191217141120-791af96035a5
+	github.com/openshift/client-go v0.0.0-20191216194936-57f413491e9e
 	github.com/openshift/crd-schema-gen v1.0.0
 	github.com/openshift/installer v0.9.0-master.0.20190726121806-6e8f9c335410
-	github.com/openshift/library-go v0.0.0-20191030100914-d6f3b526f033
-	github.com/prometheus/client_golang v0.9.4
-	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
-	github.com/prometheus/common v0.4.1
-	github.com/prometheus/procfs v0.0.5 // indirect
-	github.com/soheilhy/cmux v0.1.4 // indirect
+	github.com/openshift/library-go v0.0.0-20191218095328-1c12909e5923
+	github.com/prometheus/client_golang v1.1.0
+	github.com/prometheus/client_model v0.0.0-20191202183732-d1d2010b5bee
+	github.com/prometheus/common v0.6.0
+	github.com/prometheus/procfs v0.0.8 // indirect
 	github.com/spf13/cobra v0.0.5
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
-	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/bbolt v1.3.3 // indirect
-	go.uber.org/zap v1.12.0 // indirect
-	golang.org/x/crypto v0.0.0-20191029031824-8986dd9e96cf // indirect
-	golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-	golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect
+	go.uber.org/atomic v1.5.1 // indirect
+	go.uber.org/multierr v1.4.0 // indirect
+	go.uber.org/zap v1.13.0 // indirect
+	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
+	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
+	golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
-	golang.org/x/tools v0.0.0-20191031144223-d9fd88a569ec // indirect
+	golang.org/x/tools v0.0.0-20191210221141-98df12377212 // indirect
 	gonum.org/v1/gonum v0.6.0 // indirect
 	google.golang.org/api v0.7.0
 	google.golang.org/appengine v1.6.5 // indirect
-	google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6 // indirect
-	google.golang.org/grpc v1.24.0 // indirect
-	gopkg.in/yaml.v2 v2.2.4
-	k8s.io/api v0.0.0-20191016110408-35e52d86657a
-	k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65 // indirect
-	k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
-	k8s.io/client-go v0.0.0-20191016111102-bec269661e48
-	k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
+	google.golang.org/genproto v0.0.0-20191206224255-0243a4be9c8f // indirect
+	google.golang.org/grpc v1.25.1 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/yaml.v2 v2.2.7
+	k8s.io/api v0.17.0
+	k8s.io/apimachinery v0.17.0
+	k8s.io/client-go v0.17.0
+	k8s.io/code-generator v0.17.0
 	k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f // indirect
 	k8s.io/klog v1.0.0
-	k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d // indirect
-	k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d // indirect
+	k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6 // indirect
 	sigs.k8s.io/controller-tools v0.2.1 // indirect
 )