diff --git a/go.mod b/go.mod index 4cabb7abd2..40e06c6d88 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( github.com/google/go-cmp v0.3.0 github.com/imdario/mergo v0.3.7 // indirect github.com/kevinburke/go-bindata v3.11.0+incompatible - github.com/openshift/api v3.9.1-0.20190925205819-e39b0dc4e188+incompatible - github.com/openshift/library-go v0.0.0-20190925211623-9b918c218a4e + github.com/openshift/api v3.9.1-0.20190930094450-41448ee845f6+incompatible + github.com/openshift/library-go v0.0.0-20190927184318-c355e2019bb3 github.com/pkg/errors v0.8.1 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 // indirect github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect diff --git a/go.sum b/go.sum index 1ead0c34d0..f16d3d2624 100644 --- a/go.sum +++ b/go.sum @@ -281,10 +281,14 @@ github.com/openshift/api v3.9.1-0.20190905013149-e6c3eeae444f+incompatible h1:CA github.com/openshift/api v3.9.1-0.20190905013149-e6c3eeae444f+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openshift/api v3.9.1-0.20190925205819-e39b0dc4e188+incompatible h1:fo4PhGUciMa8Xs2wtOSYY51cnr3+4o/Zkc8nWIC3t/E= github.com/openshift/api v3.9.1-0.20190925205819-e39b0dc4e188+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= +github.com/openshift/api v3.9.1-0.20190930094450-41448ee845f6+incompatible h1:L2Rs2csZGJlrc6/U7q9FF6TFC4WHj0lnWfO5KukBa9A= +github.com/openshift/api v3.9.1-0.20190930094450-41448ee845f6+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= github.com/openshift/library-go v0.0.0-20190613200606-e617f832835d h1:a/+OnGnX5qMHSSuKcSSLMPZghOgD48NNZgzDklj9cIc= github.com/openshift/library-go v0.0.0-20190613200606-e617f832835d/go.mod h1:NBttNjZpWwup/nthuLbPAPSYC8Qyo+BBK5bCtFoyYjo= github.com/openshift/library-go v0.0.0-20190925211623-9b918c218a4e h1:hDRrx7dI0ANkTLLWRmv2KyAt3hvnYewqa9PnEyk+2ho= github.com/openshift/library-go v0.0.0-20190925211623-9b918c218a4e/go.mod h1:NBttNjZpWwup/nthuLbPAPSYC8Qyo+BBK5bCtFoyYjo= +github.com/openshift/library-go v0.0.0-20190927184318-c355e2019bb3 h1:8DJ9+kpIhJvzDv73DSXt4PW7X4t7w0ovure43aZrP+w= +github.com/openshift/library-go v0.0.0-20190927184318-c355e2019bb3/go.mod h1:NBttNjZpWwup/nthuLbPAPSYC8Qyo+BBK5bCtFoyYjo= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 h1:zNBQb37RGLmJybyMcs983HfUfpkw9OTFD9tbBfAViHE= diff --git a/vendor/github.com/openshift/api/operator/v1/types_ingress.go b/vendor/github.com/openshift/api/operator/v1/types_ingress.go index 05f1113ad5..1d119b5b4d 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_ingress.go +++ b/vendor/github.com/openshift/api/operator/v1/types_ingress.go @@ -70,9 +70,9 @@ type IngressControllerSpec struct { // If unset, the default is based on // infrastructure.config.openshift.io/cluster .status.platform: // - // AWS: LoadBalancerService - // Azure: LoadBalancerService - // GCP: LoadBalancerService + // AWS: LoadBalancerService (with External scope) + // Azure: LoadBalancerService (with External scope) + // GCP: LoadBalancerService (with External scope) // Libvirt: HostNetwork // // Any other platform types (including None) default to HostNetwork. @@ -186,9 +186,10 @@ var ( // LoadBalancerStrategy holds parameters for a load balancer. type LoadBalancerStrategy struct { // scope indicates the scope at which the load balancer is exposed. - // Possible values are "External" and "Internal". The default is - // "External". - // +optional + // Possible values are "External" and "Internal". + // + // +kubebuilder:validation:Required + // +required Scope LoadBalancerScope `json:"scope"` } diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go index 936e482b3f..57e40e8b17 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go @@ -270,7 +270,7 @@ var map_IngressControllerSpec = map[string]string{ "": "IngressControllerSpec is the specification of the desired behavior of the IngressController.", "domain": "domain is a DNS name serviced by the ingress controller and is used to configure multiple features:\n\n* For the LoadBalancerService endpoint publishing strategy, domain is\n used to configure DNS records. See endpointPublishingStrategy.\n\n* When using a generated default certificate, the certificate will be valid\n for domain and its subdomains. See defaultCertificate.\n\n* The value is published to individual Route statuses so that end-users\n know where to target external DNS records.\n\ndomain must be unique among all IngressControllers, and cannot be updated.\n\nIf empty, defaults to ingress.config.openshift.io/cluster .spec.domain.", "replicas": "replicas is the desired number of ingress controller replicas. If unset, defaults to 2.", - "endpointPublishingStrategy": "endpointPublishingStrategy is used to publish the ingress controller endpoints to other networks, enable load balancer integrations, etc.\n\nIf unset, the default is based on infrastructure.config.openshift.io/cluster .status.platform:\n\n AWS: LoadBalancerService\n Azure: LoadBalancerService\n GCP: LoadBalancerService\n Libvirt: HostNetwork\n\nAny other platform types (including None) default to HostNetwork.\n\nendpointPublishingStrategy cannot be updated.", + "endpointPublishingStrategy": "endpointPublishingStrategy is used to publish the ingress controller endpoints to other networks, enable load balancer integrations, etc.\n\nIf unset, the default is based on infrastructure.config.openshift.io/cluster .status.platform:\n\n AWS: LoadBalancerService (with External scope)\n Azure: LoadBalancerService (with External scope)\n GCP: LoadBalancerService (with External scope)\n Libvirt: HostNetwork\n\nAny other platform types (including None) default to HostNetwork.\n\nendpointPublishingStrategy cannot be updated.", "defaultCertificate": "defaultCertificate is a reference to a secret containing the default certificate served by the ingress controller. When Routes don't specify their own certificate, defaultCertificate is used.\n\nThe secret must contain the following keys and data:\n\n tls.crt: certificate file contents\n tls.key: key file contents\n\nIf unset, a wildcard certificate is automatically generated and used. The certificate is valid for the ingress controller domain (and subdomains) and the generated certificate's CA will be automatically integrated with the cluster's trust store.\n\nThe in-use certificate (whether generated or user-specified) will be automatically integrated with OpenShift's built-in OAuth server.", "namespaceSelector": "namespaceSelector is used to filter the set of namespaces serviced by the ingress controller. This is useful for implementing shards.\n\nIf unset, the default is no filtering.", "routeSelector": "routeSelector is used to filter the set of Routes serviced by the ingress controller. This is useful for implementing shards.\n\nIf unset, the default is no filtering.", @@ -296,7 +296,7 @@ func (IngressControllerStatus) SwaggerDoc() map[string]string { var map_LoadBalancerStrategy = map[string]string{ "": "LoadBalancerStrategy holds parameters for a load balancer.", - "scope": "scope indicates the scope at which the load balancer is exposed. Possible values are \"External\" and \"Internal\". The default is \"External\".", + "scope": "scope indicates the scope at which the load balancer is exposed. Possible values are \"External\" and \"Internal\".", } func (LoadBalancerStrategy) SwaggerDoc() map[string]string { diff --git a/vendor/modules.txt b/vendor/modules.txt index 54742fa121..b6ea4030b4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -132,11 +132,11 @@ github.com/nbutton23/zxcvbn-go/adjacency github.com/nbutton23/zxcvbn-go/entropy github.com/nbutton23/zxcvbn-go/frequency github.com/nbutton23/zxcvbn-go/data -# github.com/openshift/api v3.9.1-0.20190925205819-e39b0dc4e188+incompatible +# github.com/openshift/api v3.9.1-0.20190930094450-41448ee845f6+incompatible github.com/openshift/api/config/v1 github.com/openshift/api/operator/v1 github.com/openshift/api/route/v1 -# github.com/openshift/library-go v0.0.0-20190925211623-9b918c218a4e +# github.com/openshift/library-go v0.0.0-20190927184318-c355e2019bb3 github.com/openshift/library-go/pkg/crypto # github.com/pkg/errors v0.8.1 github.com/pkg/errors