Skip to content

Commit

Permalink
Remove unusued code and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Demichev committed Mar 17, 2020
1 parent c0b8070 commit c8d1789
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 72 deletions.
3 changes: 1 addition & 2 deletions cmd/machine-healthcheck/main.go
View file
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/openshift/machine-api-operator/pkg/controller/machinehealthcheck"

"github.com/golang/glog"
"github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
mapiv1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
"github.com/openshift/machine-api-operator/pkg/controller"
sdkVersion "github.com/operator-framework/operator-sdk/version"
Expand Down Expand Up @@ -51,7 +50,7 @@ func main() {
glog.Infof("Registering Components.")

// Setup Scheme for all resources
if err := v1beta1.AddToScheme(mgr.GetScheme()); err != nil {
if err := mapiv1.AddToScheme(mgr.GetScheme()); err != nil {
glog.Fatal(err)
}
if err := mapiv1.AddToScheme(mgr.GetScheme()); err != nil {
Expand Down
8 changes: 2 additions & 6 deletions pkg/controller/machine/controller.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -406,7 +405,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
}
Expand Down Expand Up @@ -442,10 +441,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 {
Expand Down
9 changes: 6 additions & 3 deletions pkg/controller/machine/machine_controller_suite_test.go
View file
Expand Up @@ -61,14 +61,17 @@ func SetupTestReconcile(inner reconcile.Reconciler) (reconcile.Reconciler, chan
}

// StartTestManager adds recFn
func StartTestManager(mgr manager.Manager, t *testing.T) chan struct{} {
func StartTestManager(mgr manager.Manager, t *testing.T) (chan struct{}, chan error) {
t.Helper()

stop := make(chan struct{})
errs := make(chan error, 1)

go func() {
if err := mgr.Start(stop); err != nil {
t.Fatalf("error starting test manager: %v", err)
errs <- err
}
}()
return stop

return stop, errs
}
13 changes: 12 additions & 1 deletion pkg/controller/machine/machine_controller_test.go
View file
Expand Up @@ -53,7 +53,18 @@ func TestReconcile(t *testing.T) {
if err := add(mgr, recFn); err != nil {
t.Fatalf("error adding controller to manager: %v", err)
}
defer close(StartTestManager(mgr, t))

stop, errChan := StartTestManager(mgr, t)
defer close(stop)
defer func() {
select {
case err := <-errChan:
if err != nil {
t.Fatalf("error starting test manager: %v", err)
}
default:
}
}()

// Create the Machine object and expect Reconcile and the actuator to be called
if err := c.Create(context.TODO(), instance); err != nil {
Expand Down
7 changes: 0 additions & 7 deletions pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
View file
Expand Up @@ -634,13 +634,6 @@ func derefStringPointer(stringPointer *string) string {
return ""
}

func derefStringInt(intPointer *int) int {
if intPointer != nil {
return 0
}
return *intPointer
}

func minDuration(durations []time.Duration) time.Duration {
if len(durations) == 0 {
return time.Duration(0)
Expand Down
9 changes: 6 additions & 3 deletions pkg/controller/machineset/machineset_controller_suite_test.go
View file
Expand Up @@ -61,14 +61,17 @@ func SetupTestReconcile(inner reconcile.Reconciler) (reconcile.Reconciler, chan
}

// StartTestManager adds recFn
func StartTestManager(mgr manager.Manager, t *testing.T) chan struct{} {
func StartTestManager(mgr manager.Manager, t *testing.T) (chan struct{}, chan error) {
t.Helper()

stop := make(chan struct{})
errs := make(chan error, 1)

go func() {
if err := mgr.Start(stop); err != nil {
t.Fatalf("error starting test manager: %v", err)
errs <- err
}
}()
return stop

return stop, errs
}
13 changes: 12 additions & 1 deletion pkg/controller/machineset/machineset_controller_test.go
View file
Expand Up @@ -49,7 +49,18 @@ func TestReconcile(t *testing.T) {
if err := add(mgr, recFn, r.MachineToMachineSets); err != nil {
t.Errorf("error adding controller to manager: %v", err)
}
defer close(StartTestManager(mgr, t))

stop, errChan := StartTestManager(mgr, t)
defer close(stop)
defer func() {
select {
case err := <-errChan:
if err != nil {
t.Fatalf("error starting test manager: %v", err)
}
default:
}
}()

replicas := int32(2)
labels := map[string]string{"foo": "bar"}
Expand Down
7 changes: 3 additions & 4 deletions pkg/controller/vsphere/machine_scope.go
View file
Expand Up @@ -22,10 +22,9 @@ const (
// machineScopeParams defines the input parameters used to create a new MachineScope.
type machineScopeParams struct {
context.Context
client runtimeclient.Client
apiReader runtimeclient.Reader
machine *machinev1.Machine
vSphereConfig *vSphereConfig
client runtimeclient.Client
apiReader runtimeclient.Reader
machine *machinev1.Machine
}

// machineScope defines a scope defined around a machine and its cluster.
Expand Down
49 changes: 24 additions & 25 deletions pkg/controller/vsphere/machine_scope_test.go
View file
Expand Up @@ -7,8 +7,7 @@ import (
"testing"

machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
apivsphere "github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1alpha1"
vsphereapi "github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1alpha1"
vspherev1 "github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1alpha1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -20,8 +19,8 @@ import (

const TestNamespace = "vsphere-test"

func MachineWithSpec(spec *apivsphere.VSphereMachineProviderSpec) *machinev1.Machine {
rawSpec, err := vsphereapi.RawExtensionFromProviderSpec(spec)
func MachineWithSpec(spec *vspherev1.VSphereMachineProviderSpec) *machinev1.Machine {
rawSpec, err := vspherev1.RawExtensionFromProviderSpec(spec)
if err != nil {
panic("Failed to encode raw extension from provider spec")
}
Expand All @@ -42,7 +41,7 @@ func MachineWithSpec(spec *apivsphere.VSphereMachineProviderSpec) *machinev1.Mac
func TestGetUserData(t *testing.T) {
userDataSecretName := "vsphere-ignition"

defaultProviderSpec := &apivsphere.VSphereMachineProviderSpec{
defaultProviderSpec := &vspherev1.VSphereMachineProviderSpec{
UserDataSecret: &corev1.LocalObjectReference{
Name: userDataSecretName,
},
Expand All @@ -51,7 +50,7 @@ func TestGetUserData(t *testing.T) {
testCases := []struct {
testCase string
userDataSecret *corev1.Secret
providerSpec *apivsphere.VSphereMachineProviderSpec
providerSpec *vspherev1.VSphereMachineProviderSpec
expectedUserdata []byte
expectError bool
}{
Expand Down Expand Up @@ -100,7 +99,7 @@ func TestGetUserData(t *testing.T) {
{
testCase: "no user-data in provider spec",
userDataSecret: nil,
providerSpec: &apivsphere.VSphereMachineProviderSpec{},
providerSpec: &vspherev1.VSphereMachineProviderSpec{},
expectError: false,
expectedUserdata: nil,
},
Expand Down Expand Up @@ -130,7 +129,7 @@ func TestGetUserData(t *testing.T) {
t.Errorf("Unexpected error: %v", err)
}

if bytes.Compare(userData, tc.expectedUserdata) != 0 {
if !bytes.Equal(userData, tc.expectedUserdata) {
t.Errorf("Got: %q, Want: %q", userData, tc.expectedUserdata)
}
})
Expand All @@ -146,7 +145,7 @@ func TestGetCredentialsSecret(t *testing.T) {
testCases := []struct {
testCase string
secret *corev1.Secret
providerSpec *apivsphere.VSphereMachineProviderSpec
providerSpec *vspherev1.VSphereMachineProviderSpec
expectError bool
expectCredentials bool
}{
Expand All @@ -162,11 +161,11 @@ func TestGetCredentialsSecret(t *testing.T) {
expectedCredentialsSecretPassword: []byte(expectedPassword),
},
},
providerSpec: &apivsphere.VSphereMachineProviderSpec{
providerSpec: &vspherev1.VSphereMachineProviderSpec{
CredentialsSecret: &corev1.LocalObjectReference{
Name: "test",
},
Workspace: &apivsphere.Workspace{
Workspace: &vspherev1.Workspace{
Server: expectedServer,
},
},
Expand All @@ -184,11 +183,11 @@ func TestGetCredentialsSecret(t *testing.T) {
expectedCredentialsSecretPassword: []byte(expectedPassword),
},
},
providerSpec: &apivsphere.VSphereMachineProviderSpec{
providerSpec: &vspherev1.VSphereMachineProviderSpec{
CredentialsSecret: &corev1.LocalObjectReference{
Name: "secret-does-not-exist",
},
Workspace: &apivsphere.Workspace{
Workspace: &vspherev1.Workspace{
Server: expectedServer,
},
},
Expand All @@ -206,11 +205,11 @@ func TestGetCredentialsSecret(t *testing.T) {
expectedCredentialsSecretPassword: []byte(expectedPassword),
},
},
providerSpec: &apivsphere.VSphereMachineProviderSpec{
providerSpec: &vspherev1.VSphereMachineProviderSpec{
CredentialsSecret: &corev1.LocalObjectReference{
Name: "test",
},
Workspace: &apivsphere.Workspace{
Workspace: &vspherev1.Workspace{
Server: expectedServer,
},
},
Expand All @@ -228,11 +227,11 @@ func TestGetCredentialsSecret(t *testing.T) {
"badPasswordKey": []byte(expectedPassword),
},
},
providerSpec: &apivsphere.VSphereMachineProviderSpec{
providerSpec: &vspherev1.VSphereMachineProviderSpec{
CredentialsSecret: &corev1.LocalObjectReference{
Name: "test",
},
Workspace: &apivsphere.Workspace{
Workspace: &vspherev1.Workspace{
Server: expectedServer,
},
},
Expand All @@ -250,7 +249,7 @@ func TestGetCredentialsSecret(t *testing.T) {
expectedCredentialsSecretPassword: []byte(expectedPassword),
},
},
providerSpec: &apivsphere.VSphereMachineProviderSpec{},
providerSpec: &vspherev1.VSphereMachineProviderSpec{},
expectError: false,
expectCredentials: false,
},
Expand Down Expand Up @@ -298,25 +297,25 @@ func TestPatchMachine(t *testing.T) {
}

// original objects
originalProviderSpec := apivsphere.VSphereMachineProviderSpec{
originalProviderSpec := vspherev1.VSphereMachineProviderSpec{
CredentialsSecret: &corev1.LocalObjectReference{
Name: "test",
},

Workspace: &apivsphere.Workspace{
Workspace: &vspherev1.Workspace{
Server: server.URL.Host,
Folder: "test",
},
}
rawProviderSpec, err := apivsphere.RawExtensionFromProviderSpec(&originalProviderSpec)
rawProviderSpec, err := vspherev1.RawExtensionFromProviderSpec(&originalProviderSpec)
if err != nil {
t.Fatal(err)
}

originalProviderStatus := &apivsphere.VSphereMachineProviderStatus{
originalProviderStatus := &vspherev1.VSphereMachineProviderStatus{
TaskRef: "test",
}
rawProviderStatus, err := apivsphere.RawExtensionFromProviderStatus(originalProviderStatus)
rawProviderStatus, err := vspherev1.RawExtensionFromProviderStatus(originalProviderStatus)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -349,10 +348,10 @@ func TestPatchMachine(t *testing.T) {
Address: "127.0.0.1",
},
}
expectedProviderStatus := &apivsphere.VSphereMachineProviderStatus{
expectedProviderStatus := &vspherev1.VSphereMachineProviderStatus{
TaskRef: "mutated",
}
rawProviderStatus, err = apivsphere.RawExtensionFromProviderStatus(expectedProviderStatus)
rawProviderStatus, err = vspherev1.RawExtensionFromProviderStatus(expectedProviderStatus)
if err != nil {
t.Fatal(err)
}
Expand Down
17 changes: 1 addition & 16 deletions pkg/operator/operator_test.go
View file
Expand Up @@ -6,7 +6,6 @@ import (
"time"

openshiftv1 "github.com/openshift/api/config/v1"
osconfigv1 "github.com/openshift/api/config/v1"
fakeos "github.com/openshift/client-go/config/clientset/versioned/fake"
configinformersv1 "github.com/openshift/client-go/config/informers/externalversions"
"github.com/stretchr/testify/assert"
Expand All @@ -28,20 +27,6 @@ const (
releaseVersion = "0.0.0.test-unit"
)

func newOperatorConfig() *OperatorConfig {
baremetalControllers := BaremetalControllers{}

return &OperatorConfig{
targetNamespace,
Controllers{
"docker.io/openshift/origin-aws-machine-controllers:v4.0.0",
"docker.io/openshift/origin-machine-api-operator:v4.0.0",
"docker.io/openshift/origin-machine-api-operator:v4.0.0",
},
baremetalControllers,
}
}

func newFakeOperator(kubeObjects []runtime.Object, osObjects []runtime.Object, stopCh <-chan struct{}) *Operator {
kubeClient := fakekube.NewSimpleClientset(kubeObjects...)
osClient := fakeos.NewSimpleClientset(osObjects...)
Expand Down Expand Up @@ -72,7 +57,7 @@ func newFakeOperator(kubeObjects []runtime.Object, osObjects []runtime.Object, s
deployInformer.Informer().AddEventHandler(optr.eventHandlerDeployments())
featureGateInformer.Informer().AddEventHandler(optr.eventHandler())

optr.operandVersions = []osconfigv1.OperandVersion{
optr.operandVersions = []openshiftv1.OperandVersion{
{Name: "operator", Version: releaseVersion},
}

Expand Down
7 changes: 3 additions & 4 deletions pkg/operator/status_test.go
View file
Expand Up @@ -35,10 +35,9 @@ func TestPrintOperandVersions(t *testing.T) {

func TestOperatorStatusProgressing(t *testing.T) {
type tCase struct {
currentVersion []osconfigv1.OperandVersion
desiredVersion []osconfigv1.OperandVersion
expectedConditions []osconfigv1.ClusterOperatorStatusCondition
transitionTimeUpdated bool
currentVersion []osconfigv1.OperandVersion
desiredVersion []osconfigv1.OperandVersion
expectedConditions []osconfigv1.ClusterOperatorStatusCondition
}
tCases := []tCase{
{
Expand Down

0 comments on commit c8d1789

Please sign in to comment.