Revendor MAO with InstanceUpdateCount fix

Include fix from openshift/machine-api-operator#670
openshift · Aug 24, 2020 · 25e0934 · 25e0934
1 parent 0aedb19
commit 25e0934
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 65 deletions.
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/onsi/ginkgo v1.12.0
 	github.com/onsi/gomega v1.8.1
 	github.com/openshift/api v0.0.0-20200424083944-0422dc17083e
-	github.com/openshift/machine-api-operator v0.2.1-0.20200722104429-f4f9b84df9b7
+	github.com/openshift/machine-api-operator v0.2.1-0.20200819233022-79ac5f8a0097
 
 	// kube 1.18
 	k8s.io/api v0.18.2

diff --git a/go.sum b/go.sum
@@ -342,12 +342,16 @@ github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200618001858-
 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/go.mod h1:2kWwXTkpoQJUN3jZ3QW88EIY1hdRMqxgRs2hheEW/pg=
 github.com/openshift/machine-api-operator v0.2.1-0.20200527204437-14e5e0c7d862/go.mod h1:YKEQMHjXzrzm4fQGTyHBafFfQ/Yq/FrV+1YcGdPCp+0=
 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 h1:jeLZ5Ng+Ri42dbZveN1ofrrRsUnYusauzeXPDTnXQfE=
 github.com/openshift/machine-api-operator v0.2.1-0.20200722104429-f4f9b84df9b7/go.mod h1:XDsNRAVEJtkI00e51SAZ/PnqNJl1zv0rHXSdl9L1oOY=
+github.com/openshift/machine-api-operator v0.2.1-0.20200819233022-79ac5f8a0097 h1:vV7hlJyXrZfW/1GWjFmAgtxLhjgIW8ECurR3MNlsBio=
+github.com/openshift/machine-api-operator v0.2.1-0.20200819233022-79ac5f8a0097/go.mod h1:flL4H7gYTcX6pSmalAYaZ60LC+tUGw80ocKq082ydzY=
 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=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

diff --git a/...t/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1/gcpmachineproviderconfig_types.go b/...t/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1/gcpmachineproviderconfig_types.go
diff --git a/vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machine_webhook.go b/vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machine_webhook.go
diff --git a/...b.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machinehealthcheck_types.go b/...b.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machinehealthcheck_types.go
diff --git a/.../github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machineset_webhook.go b/.../github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machineset_webhook.go
diff --git a/...thub.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go b/...thub.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/zz_generated.deepcopy.go
diff --git a/vendor/github.com/openshift/machine-api-operator/pkg/metrics/metrics.go b/vendor/github.com/openshift/machine-api-operator/pkg/metrics/metrics.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -192,9 +192,9 @@ github.com/openshift/api/config/v1
 github.com/openshift/client-go/config/clientset/versioned
 github.com/openshift/client-go/config/clientset/versioned/scheme
 github.com/openshift/client-go/config/clientset/versioned/typed/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/machine-api-operator v0.2.1-0.20200722104429-f4f9b84df9b7
+# github.com/openshift/machine-api-operator v0.2.1-0.20200819233022-79ac5f8a0097
 github.com/openshift/machine-api-operator/pkg/apis/machine
 github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1
 github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1beta1