go.mod: fix parse error

Fix the go.mod parsing error caused by updating openshift/api.

Fixes: #4728
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

1 files changed, 22 insertions, 18 deletions

diff --git a/vendor/github.com/openshift/api/config/v1/types_image.go b/vendor/github.com/openshift/api/config/v1/types_image.go
index f0cf220d3..bf594c1b7 100644
--- a/vendor/github.com/openshift/api/config/v1/types_image.go
+++ b/vendor/github.com/openshift/api/config/v1/types_image.go
@@ -6,10 +6,14 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // +genclient:nonNamespaced
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// Image holds cluster-wide information about how to handle images.  The canonical name is `cluster`
+// Image governs policies related to imagestream imports and runtime configuration
+// for external registries. It allows cluster admins to configure which registries
+// OpenShift is allowed to import images from, extra CA trust bundles for external
+// registries, and policies to blacklist/whitelist registry hostnames.
+// When exposing OpenShift's image registry to the public, this also lets cluster
+// admins specify the external hostname.
 type Image struct {
-	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
+	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// spec holds user settable values for configuration
@@ -22,7 +26,7 @@ type Image struct {
 }
 
 type ImageSpec struct {
-	// AllowedRegistriesForImport limits the container image registries that normal users may import
+	// allowedRegistriesForImport limits the container image registries that normal users may import
 	// images from. Set this list to the registries that you trust to contain valid Docker
 	// images and that you want applications to be able to import from. Users with
 	// permission to create Images or ImageStreamMappings via the API are not affected by
@@ -38,14 +42,14 @@ type ImageSpec struct {
 	// +optional
 	ExternalRegistryHostnames []string `json:"externalRegistryHostnames,omitempty"`
 
-	// AdditionalTrustedCA is a reference to a ConfigMap containing additional CAs that
-	// should be trusted during imagestream import, pod image pull, and imageregistry
-	// pullthrough.
+	// additionalTrustedCA is a reference to a ConfigMap containing additional CAs that
+	// should be trusted during imagestream import, pod image pull, build image pull, and
+	// imageregistry pullthrough.
 	// The namespace for this config map is openshift-config.
 	// +optional
 	AdditionalTrustedCA ConfigMapNameReference `json:"additionalTrustedCA"`
 
-	// RegistrySources contains configuration that determines how the container runtime
+	// registrySources contains configuration that determines how the container runtime
 	// should treat individual registries when accessing images for builds+pods. (e.g.
 	// whether or not to allow insecure access).  It does not contain configuration for the
 	// internal cluster registry.
@@ -55,10 +59,10 @@ type ImageSpec struct {
 
 type ImageStatus struct {
 
-	// this value is set by the image registry operator which controls the internal registry hostname
-	// InternalRegistryHostname sets the hostname for the default internal image
+	// internalRegistryHostname sets the hostname for the default internal image
 	// registry. The value must be in "hostname[:port]" format.
-	// For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
+	// This value is set by the image registry operator which controls the internal registry
+	// hostname. For backward compatibility, users can still use OPENSHIFT_DEFAULT_REGISTRY
 	// environment variable but this setting overrides the environment variable.
 	// +optional
 	InternalRegistryHostname string `json:"internalRegistryHostname,omitempty"`
@@ -75,19 +79,19 @@ type ImageStatus struct {
 
 type ImageList struct {
 	metav1.TypeMeta `json:",inline"`
-	// Standard object's metadata.
 	metav1.ListMeta `json:"metadata"`
-	Items           []Image `json:"items"`
+
+	Items []Image `json:"items"`
 }
 
 // RegistryLocation contains a location of the registry specified by the registry domain
 // name. The domain name might include wildcards, like '*' or '??'.
 type RegistryLocation struct {
-	// DomainName specifies a domain name for the registry
+	// domainName specifies a domain name for the registry
 	// In case the registry use non-standard (80 or 443) port, the port should be included
 	// in the domain name as well.
 	DomainName string `json:"domainName"`
-	// Insecure indicates whether the registry is secure (https) or insecure (http)
+	// insecure indicates whether the registry is secure (https) or insecure (http)
 	// By default (if not specified) the registry is assumed as secure.
 	// +optional
 	Insecure bool `json:"insecure,omitempty"`
@@ -95,15 +99,15 @@ type RegistryLocation struct {
 
 // RegistrySources holds cluster-wide information about how to handle the registries config.
 type RegistrySources struct {
-	// InsecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.
+	// insecureRegistries are registries which do not have a valid TLS certificates or only support HTTP connections.
 	// +optional
 	InsecureRegistries []string `json:"insecureRegistries,omitempty"`
-	// BlockedRegistries are blacklisted from image pull/push. All other registries are allowed.
+	// blockedRegistries are blacklisted from image pull/push. All other registries are allowed.
 	//
 	// Only one of BlockedRegistries or AllowedRegistries may be set.
 	// +optional
 	BlockedRegistries []string `json:"blockedRegistries,omitempty"`
-	// AllowedRegistries are whitelisted for image pull/push. All other registries are blocked.
+	// allowedRegistries are whitelisted for image pull/push. All other registries are blocked.
 	//
 	// Only one of BlockedRegistries or AllowedRegistries may be set.
 	// +optional