From 96f74b4f0711e4947f3dc5e512ea72e022ab189a Mon Sep 17 00:00:00 2001 From: Michael McCune Date: Tue, 22 Sep 2020 12:10:04 -0400 Subject: [PATCH] Bug 1878880: re-vendor machine-api-operator at e0db6b65 This change is being proposed to pick up the recent log message changes as proposed in https://github.com/openshift/machine-api-operator/pull/681 --- go.mod | 2 +- go.sum | 4 ++-- .../openshift/machine-api-operator/Dockerfile.rhel | 2 +- .../pkg/apis/machine/v1beta1/machine_webhook.go | 5 +++++ .../pkg/controller/machine/controller.go | 4 ++-- vendor/modules.txt | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 448509961..fbdd20d64 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/go-logr/zapr v0.2.0 // indirect github.com/metal3-io/baremetal-operator v0.0.0-00010101000000-000000000000 github.com/onsi/gomega v1.10.1 - github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12 + github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.5.1 golang.org/x/net v0.0.0-20200707034311-ab3426394381 diff --git a/go.sum b/go.sum index 8d3195395..33a142573 100644 --- a/go.sum +++ b/go.sum @@ -741,8 +741,8 @@ github.com/openshift/machine-api-operator v0.2.1-0.20200527204437-14e5e0c7d862/g 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/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12 h1:XA1F/7MliCpUMZ1llUAE2R5tDvQSTtRb96HV726f3+Y= -github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12/go.mod h1:SA92GU0BSLwmjwD9rL2OTXiRmcSMhgYPw5RXH4OuM4U= +github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71 h1:w50MvkvZPOx30R3wMvSPRRJsPipxM82Ny9mY67DnpDk= +github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71/go.mod h1:SA92GU0BSLwmjwD9rL2OTXiRmcSMhgYPw5RXH4OuM4U= github.com/openshift/origin v0.0.0-20160503220234-8f127d736703/go.mod h1:0Rox5r9C8aQn6j1oAOQ0c1uC86mYbUFObzjBRvUKHII= github.com/openshift/prom-label-proxy v0.1.1-0.20191016113035-b8153a7f39f1/go.mod h1:p5MuxzsYP1JPsNGwtjtcgRHHlGziCJJfztff91nNixw= github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= diff --git a/vendor/github.com/openshift/machine-api-operator/Dockerfile.rhel b/vendor/github.com/openshift/machine-api-operator/Dockerfile.rhel index c0982de4d..8771fa4ee 100644 --- a/vendor/github.com/openshift/machine-api-operator/Dockerfile.rhel +++ b/vendor/github.com/openshift/machine-api-operator/Dockerfile.rhel @@ -1,4 +1,4 @@ -FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder +FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder WORKDIR /go/src/github.com/openshift/machine-api-operator COPY . . RUN NO_DOCKER=1 make build 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 6a6bc31a9..0040c2adc 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 @@ -91,6 +91,7 @@ const ( defaultWebhookConfigurationName = "machine-api" defaultWebhookServiceName = "machine-api-operator-webhook" defaultWebhookServiceNamespace = "openshift-machine-api" + defaultWebhookServicePort = 443 defaultUserDataSecret = "worker-user-data-managed" defaultSecretNamespace = "openshift-machine-api" @@ -284,6 +285,7 @@ func MachineValidatingWebhook() admissionregistrationv1.ValidatingWebhook { Namespace: defaultWebhookServiceNamespace, Name: defaultWebhookServiceName, Path: pointer.StringPtr(DefaultMachineValidatingHookPath), + Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.ValidatingWebhook{ AdmissionReviewVersions: []string{"v1beta1"}, @@ -315,6 +317,7 @@ func MachineSetValidatingWebhook() admissionregistrationv1.ValidatingWebhook { Namespace: defaultWebhookServiceNamespace, Name: defaultWebhookServiceName, Path: pointer.StringPtr(DefaultMachineSetValidatingHookPath), + Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.ValidatingWebhook{ AdmissionReviewVersions: []string{"v1beta1"}, @@ -367,6 +370,7 @@ func MachineMutatingWebhook() admissionregistrationv1.MutatingWebhook { Namespace: defaultWebhookServiceNamespace, Name: defaultWebhookServiceName, Path: pointer.StringPtr(DefaultMachineMutatingHookPath), + Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.MutatingWebhook{ AdmissionReviewVersions: []string{"v1beta1"}, @@ -397,6 +401,7 @@ func MachineSetMutatingWebhook() admissionregistrationv1.MutatingWebhook { Namespace: defaultWebhookServiceNamespace, Name: defaultWebhookServiceName, Path: pointer.StringPtr(DefaultMachineSetMutatingHookPath), + Port: pointer.Int32Ptr(defaultWebhookServicePort), } return admissionregistrationv1.MutatingWebhook{ AdmissionReviewVersions: []string{"v1beta1"}, 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 8b84b7e0a..9283d5ce4 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 @@ -244,9 +244,9 @@ func (r *ReconcileMachine) Reconcile(request reconcile.Request) (reconcile.Resul } if m.Status.NodeRef != nil { - klog.Infof("%v: deleting node %q for machine", m.Status.NodeRef.Name, machineName) + klog.Infof("%v: deleting node %q for machine", machineName, m.Status.NodeRef.Name) if err := r.deleteNode(ctx, m.Status.NodeRef.Name); err != nil { - klog.Errorf("%v: error deleting node %q for machine", machineName, err) + klog.Errorf("%v: error deleting node for machine: %v", machineName, err) return reconcile.Result{}, err } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4f5384cbc..532b7c6b5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -132,7 +132,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.20200901173901-9056dbc8c9b9 github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1 -# github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12 +# github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71 github.com/openshift/machine-api-operator github.com/openshift/machine-api-operator/pkg/apis/machine github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1