diff --git a/go.mod b/go.mod index aa3ec2ef31..ea2ecdbb64 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.7.0 // kube 1.16 - github.com/openshift/machine-api-operator v0.2.1-0.20200310180732-c63fa2b143f0 + github.com/openshift/machine-api-operator v0.2.1-0.20200320004730-01120a0337a6 github.com/pkg/errors v0.8.1 github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index 620231b4b7..7def500c1c 100644 --- a/go.sum +++ b/go.sum @@ -295,8 +295,8 @@ github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQ github.com/openshift/api v0.0.0-20200127192224-ffde1bfabb9f/go.mod h1:fT6U/JfG8uZzemTRwZA2kBDJP5nWz7v05UHnty/D+pk= github.com/openshift/client-go v0.0.0-20190617165122-8892c0adc000/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk= github.com/openshift/cluster-version-operator v3.11.1-0.20190629164025-08cac1c02538+incompatible/go.mod h1:0BbpR1mrN0F2ZRae5N1XHcytmkvVPaeKgSQwRRBWugc= -github.com/openshift/machine-api-operator v0.2.1-0.20200310180732-c63fa2b143f0 h1:Na0422T5qq9e4AtBqH4hyqujESg29Akrf2asy/kc02U= -github.com/openshift/machine-api-operator v0.2.1-0.20200310180732-c63fa2b143f0/go.mod h1:b3huCV+DbroXP1sHtsU5xBwx97zqc6GKB5owyl2zsNM= +github.com/openshift/machine-api-operator v0.2.1-0.20200320004730-01120a0337a6 h1:trxpQtPocJw36OV8HU0M+Jl5Qi0cpLdU+nqEUeakGME= +github.com/openshift/machine-api-operator v0.2.1-0.20200320004730-01120a0337a6/go.mod h1:b3huCV+DbroXP1sHtsU5xBwx97zqc6GKB5owyl2zsNM= 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/controller/machine/controller.go b/vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go index 3cc5a95656..e546d34e9a 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 @@ -21,7 +21,6 @@ import ( "fmt" "time" - commonerrors "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1" machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1" "github.com/openshift/machine-api-operator/pkg/util" corev1 "k8s.io/api/core/v1" @@ -60,6 +59,9 @@ const ( // MachineInstanceTypeLabelName as annotation name for a machine instance type MachineInstanceTypeLabelName = "machine.openshift.io/instance-type" + // MachineInterruptibleInstanceLabelName as annotaiton name for interruptible instances + MachineInterruptibleInstanceLabelName = "machine.openshift.io/interruptible-instance" + // https://github.com/openshift/enhancements/blob/master/enhancements/machine-instance-lifecycle.md // This is not a transient error, but // indicates a state that will likely need to be fixed before progress can be made @@ -406,7 +408,7 @@ func delayIfRequeueAfterError(err error) (reconcile.Result, error) { func isInvalidMachineConfigurationError(err error) bool { switch t := err.(type) { case *MachineError: - if t.Reason == commonerrors.InvalidConfigurationMachineError { + if t.Reason == machinev1.InvalidConfigurationMachineError { klog.Infof("Actuator returned invalid configuration error: %v", err) return true } @@ -442,10 +444,7 @@ func machineHasNode(machine *machinev1.Machine) bool { } func machineIsFailed(machine *machinev1.Machine) bool { - if stringPointerDeref(machine.Status.Phase) == phaseFailed { - return true - } - return false + return stringPointerDeref(machine.Status.Phase) == phaseFailed } func nodeIsUnreachable(node *corev1.Node) bool { diff --git a/vendor/modules.txt b/vendor/modules.txt index 9ce85ab5d2..cfeb3977ff 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -143,7 +143,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge github.com/onsi/gomega/matchers/support/goraph/node github.com/onsi/gomega/matchers/support/goraph/util github.com/onsi/gomega/types -# github.com/openshift/machine-api-operator v0.2.1-0.20200310180732-c63fa2b143f0 +# github.com/openshift/machine-api-operator v0.2.1-0.20200320004730-01120a0337a6 github.com/openshift/machine-api-operator/cmd/machineset github.com/openshift/machine-api-operator/pkg/apis/machine github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1