diff --git a/go.mod b/go.mod index 2e1eecca3..294c74fca 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/onsi/ginkgo v1.12.1 github.com/onsi/gomega v1.10.1 github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971 - github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12 + github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 google.golang.org/api v0.15.0 diff --git a/go.sum b/go.sum index e4eede59d..b673802a5 100644 --- a/go.sum +++ b/go.sum @@ -437,8 +437,8 @@ github.com/openshift/machine-api-operator v0.2.1-0.20200701225707-950912b03628 h 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.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/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/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 f177cca4a..bcd3ec0ff 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -156,7 +156,7 @@ 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/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/pkg/apis/machine github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1 github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1beta1