From 907507df24185f36eb7b95c58a027bf495478750 Mon Sep 17 00:00:00 2001 From: Michael McCune Date: Tue, 4 May 2021 11:36:28 -0400 Subject: [PATCH] UPSTREAM: : openshift: Update mao dependency for webhook v1 changes --- go.mod | 2 +- go.sum | 2 ++ .../pkg/apis/machine/v1beta1/machine_webhook.go | 8 ++++---- .../pkg/controller/machine/controller.go | 9 +++++++-- vendor/modules.txt | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 02616759c48..af6c5b8df21 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/ginkgo v1.15.0 github.com/onsi/gomega v1.10.5 github.com/openshift/api v0.0.0-20210416115537-a60c0dc032fd - github.com/openshift/machine-api-operator v0.2.1-0.20210420092411-384733bfd62e + github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd github.com/spf13/cobra v1.1.1 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 diff --git a/go.sum b/go.sum index 59b71b24142..9515443608e 100644 --- a/go.sum +++ b/go.sum @@ -674,6 +674,8 @@ github.com/openshift/machine-api-operator v0.2.1-0.20201002104344-6abfb5440597/g github.com/openshift/machine-api-operator v0.2.1-0.20210322142500-9101e75223bf/go.mod h1:N3Q+UKEziycun6J3kyxQnRsBBebjwm9fnD6vSnUWqRU= github.com/openshift/machine-api-operator v0.2.1-0.20210420092411-384733bfd62e h1:4w69A/kY3LLep0io3Ap4bkfb/RT6jlowOTR0jj1qKPc= github.com/openshift/machine-api-operator v0.2.1-0.20210420092411-384733bfd62e/go.mod h1:DFZBMPtC2TYZH5NE9+2JQIpbZAnruqc9F26QmbOm9pw= +github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd h1:8gwpgdXv0TPrvPRxms3CNqDwtktmOYxTWD4MrW1TVJk= +github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd/go.mod h1:DFZBMPtC2TYZH5NE9+2JQIpbZAnruqc9F26QmbOm9pw= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= 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 index 3d08bb57097..4257b9cecc4 100644 --- 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 @@ -341,7 +341,7 @@ func MachineValidatingWebhook() admissionregistrationv1.ValidatingWebhook { Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.ValidatingWebhook{ - AdmissionReviewVersions: []string{"v1beta1"}, + AdmissionReviewVersions: []string{"v1"}, Name: "validation.machine.machine.openshift.io", FailurePolicy: &webhookFailurePolicy, SideEffects: &webhookSideEffects, @@ -373,7 +373,7 @@ func MachineSetValidatingWebhook() admissionregistrationv1.ValidatingWebhook { Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.ValidatingWebhook{ - AdmissionReviewVersions: []string{"v1beta1"}, + AdmissionReviewVersions: []string{"v1"}, Name: "validation.machineset.machine.openshift.io", FailurePolicy: &webhookFailurePolicy, SideEffects: &webhookSideEffects, @@ -426,7 +426,7 @@ func MachineMutatingWebhook() admissionregistrationv1.MutatingWebhook { Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.MutatingWebhook{ - AdmissionReviewVersions: []string{"v1beta1"}, + AdmissionReviewVersions: []string{"v1"}, Name: "default.machine.machine.openshift.io", FailurePolicy: &webhookFailurePolicy, SideEffects: &webhookSideEffects, @@ -457,7 +457,7 @@ func MachineSetMutatingWebhook() admissionregistrationv1.MutatingWebhook { Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.MutatingWebhook{ - AdmissionReviewVersions: []string{"v1beta1"}, + AdmissionReviewVersions: []string{"v1"}, Name: "default.machineset.machine.openshift.io", FailurePolicy: &webhookFailurePolicy, SideEffects: &webhookSideEffects, diff --git a/vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go b/vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go index 8511e54e9e3..537a3883a5b 100644 --- a/vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go +++ b/vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go @@ -353,9 +353,14 @@ func (r *ReconcileMachine) Reconcile(ctx context.Context, request reconcile.Requ )) // Machine resource created and instance does not exist yet. - if err := r.updateStatus(ctx, m, phaseProvisioning, nil, originalConditions); err != nil { - return reconcile.Result{}, err + if stringPointerDeref(m.Status.Phase) == "" { + klog.V(2).Infof("%v: setting phase to Provisioning and requeuing", machineName) + if err := r.updateStatus(ctx, m, phaseProvisioning, nil, originalConditions); err != nil { + return reconcile.Result{}, err + } + return reconcile.Result{RequeueAfter: requeueAfter}, nil } + klog.Infof("%v: reconciling machine triggers idempotent create", machineName) if err := r.actuator.Create(ctx, m); err != nil { klog.Warningf("%v: failed to create machine: %v", machineName, err) diff --git a/vendor/modules.txt b/vendor/modules.txt index 0befc03218b..a0b63b0dfae 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -194,7 +194,7 @@ 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.20201201000827-1117a4fc438c github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1 -# github.com/openshift/machine-api-operator v0.2.1-0.20210420092411-384733bfd62e +# github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd ## explicit github.com/openshift/machine-api-operator/pkg/apis/machine github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1