diff --git a/go.mod b/go.mod index a3d4f2e2f..3a86bf1b2 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.8.1 github.com/openshift/api v0.0.0-20200424083944-0422dc17083e github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 - github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200713133651-5c8a640669ac + github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200813171611-46c5454e7175 github.com/openshift/library-go v0.0.0-20200512120242-21a1ff978534 github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b github.com/prometheus/client_golang v1.1.0 @@ -21,7 +21,6 @@ require ( github.com/vmware/govmomi v0.22.2 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd gopkg.in/gcfg.v1 v1.2.3 - gopkg.in/warnings.v0 v0.1.2 // indirect k8s.io/api v0.18.2 k8s.io/apimachinery v0.18.2 k8s.io/client-go v0.18.2 diff --git a/go.sum b/go.sum index 65117521e..e53379323 100644 --- a/go.sum +++ b/go.sum @@ -329,10 +329,13 @@ github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200701112720-3a7d727c9a github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200701112720-3a7d727c9a10/go.mod h1:wgkZrOlcIMWTzo8khB4Js2PoDJDlIUUdzCBm7BuDdqw= github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200713133651-5c8a640669ac h1:j4kWMuCD5Yvwa3LDXy0tN0ys24jDbQnQbCl0oRTBb6I= github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200713133651-5c8a640669ac/go.mod h1:XVYX9JE339nKbDDa/W481XD+1GTeqeaBm8bDPr7WE7I= +github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200813171611-46c5454e7175 h1:9wH82ayUDy9Y+loTm319cJVTol+cwbH6ZNYKezeWCQQ= +github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200813171611-46c5454e7175/go.mod h1:rcwAydGZX+z4l91wtOdbq+fqDwuo6iu0YuFik3UUc+8= github.com/openshift/library-go v0.0.0-20200512120242-21a1ff978534 h1:RhurNEKr5RBIcnddxfoLVuB86TZRdNq8PH51/1ZAxv4= github.com/openshift/library-go v0.0.0-20200512120242-21a1ff978534/go.mod h1:2kWwXTkpoQJUN3jZ3QW88EIY1hdRMqxgRs2hheEW/pg= github.com/openshift/machine-api-operator v0.2.1-0.20200611014855-9a69f85c32dd/go.mod h1:6vMi+R3xqznBdq5rgeal9N3ak3sOpy50t0fdRCcQXjE= github.com/openshift/machine-api-operator v0.2.1-0.20200701225707-950912b03628/go.mod h1:cxjy/RUzv5C2T5FNl1KKXUgtakWsezWQ642B/CD9VQA= +github.com/openshift/machine-api-operator v0.2.1-0.20200722104429-f4f9b84df9b7/go.mod h1:XDsNRAVEJtkI00e51SAZ/PnqNJl1zv0rHXSdl9L1oOY= github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b h1:Q1q8w51pAZdx6LEkaYdSbUaaEOHXTyTXLhtGgIiKaiA= github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b/go.mod h1:iVyukRkam5JZa8AnjYf+/G3rk7JI1+M6GsU0sq0B9NA= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= diff --git a/pkg/apis/machine/v1beta1/machinehealthcheck_types.go b/pkg/apis/machine/v1beta1/machinehealthcheck_types.go index f06c85a78..16cc7ad3e 100644 --- a/pkg/apis/machine/v1beta1/machinehealthcheck_types.go +++ b/pkg/apis/machine/v1beta1/machinehealthcheck_types.go @@ -60,6 +60,7 @@ type MachineHealthCheckSpec struct { // +kubebuilder:default:="100%" // +kubebuilder:validation:Pattern="^((100|[0-9]{1,2})%|[0-9]+)$" // +kubebuilder:validation:Type:=string + // +kubebuilder:validation:Minimum:=0 MaxUnhealthy *intstr.IntOrString `json:"maxUnhealthy,omitempty"` // Machines older than this duration without a node will be considered to have diff --git a/vendor/github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1/gcpmachineproviderconfig_types.go b/vendor/github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1/gcpmachineproviderconfig_types.go index b1e9ec4c1..4271f0117 100644 --- a/vendor/github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1/gcpmachineproviderconfig_types.go +++ b/vendor/github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1/gcpmachineproviderconfig_types.go @@ -66,6 +66,7 @@ type GCPMetadata struct { type GCPNetworkInterface struct { PublicIP bool `json:"publicIP,omitempty"` Network string `json:"network,omitempty"` + ProjectID string `json:"projectID,omitempty"` Subnetwork string `json:"subnetwork,omitempty"` } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4014bbfd3..2afe8a7d1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -203,7 +203,7 @@ github.com/openshift/client-go/config/informers/externalversions/config github.com/openshift/client-go/config/informers/externalversions/config/v1 github.com/openshift/client-go/config/informers/externalversions/internalinterfaces github.com/openshift/client-go/config/listers/config/v1 -# github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200713133651-5c8a640669ac +# github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200813171611-46c5454e7175 github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1 # github.com/openshift/library-go v0.0.0-20200512120242-21a1ff978534 github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers