Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix minor linting issues #105

Merged
merged 2 commits into from Aug 5, 2020
Merged

Fix minor linting issues #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc0f08e
Remove duplicate imports
Jul 22, 2020
12aba6d
Use Contains() instead of Index()
Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions pkg/cloud/gcp/actuators/machine/reconciler.go
View file
Open in desktop
Expand Up @@ -14,9 +14,7 @@ import (
"github.com/openshift/machine-api-operator/pkg/metrics"
"google.golang.org/api/compute/v1"
googleapi "google.golang.org/api/googleapi"
apicorev1 "k8s.io/api/core/v1"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
apimachineryerrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/klog"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -70,7 +68,7 @@ func (r *Reconciler) create() error {
var disks = []*compute.AttachedDisk{}
for _, disk := range r.providerSpec.Disks {
srcImage := disk.Image
if strings.Index(disk.Image, "/") == -1 {
if !strings.Contains(disk.Image, "/") {
// only image name provided therfore defaulting to the current project
srcImage = googleapi.ResolveRelative(r.computeService.BasePath(), fmt.Sprintf("%s/global/images/%s", r.projectID, disk.Image))
}
Expand Down Expand Up @@ -194,9 +192,9 @@ func (r *Reconciler) reconcileMachineWithCloudState(failedCondition *v1beta1.GCP
}
networkInterface := freshInstance.NetworkInterfaces[0]

nodeAddresses := []v1.NodeAddress{{Type: v1.NodeInternalIP, Address: networkInterface.NetworkIP}}
nodeAddresses := []corev1.NodeAddress{{Type: corev1.NodeInternalIP, Address: networkInterface.NetworkIP}}
for _, config := range networkInterface.AccessConfigs {
nodeAddresses = append(nodeAddresses, v1.NodeAddress{Type: v1.NodeExternalIP, Address: config.NatIP})
nodeAddresses = append(nodeAddresses, corev1.NodeAddress{Type: corev1.NodeExternalIP, Address: config.NatIP})
}
// Since we don't know when the project was created, we must account for
// both types of internal-dns:
Expand Down Expand Up @@ -270,7 +268,7 @@ func (r *Reconciler) getCustomUserData() (string, error) {
if r.providerSpec.UserDataSecret == nil {
return "", nil
}
var userDataSecret apicorev1.Secret
var userDataSecret corev1.Secret

if err := r.coreClient.Get(context.Background(), client.ObjectKey{Namespace: r.machine.GetNamespace(), Name: r.providerSpec.UserDataSecret.Name}, &userDataSecret); err != nil {
if apimachineryerrors.IsNotFound(err) {
Expand Down
13 changes: 6 additions & 7 deletions pkg/cloud/gcp/actuators/machine/reconciler_test.go
View file
Open in desktop
Expand Up @@ -11,7 +11,6 @@ import (
machinecontroller "github.com/openshift/machine-api-operator/pkg/controller/machine"
compute "google.golang.org/api/compute/v1"
googleapi "google.golang.org/api/googleapi"
apiv1 "k8s.io/api/core/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/scheme"
Expand All @@ -24,7 +23,7 @@ func TestCreate(t *testing.T) {
labels map[string]string
providerSpec *gcpv1beta1.GCPMachineProviderSpec
expectedCondition *gcpv1beta1.GCPMachineProviderCondition
secret *apiv1.Secret
secret *corev1.Secret
mockInstancesInsert func(project string, zone string, instance *compute.Instance) (*compute.Operation, error)
expectedError error
}{
Expand Down Expand Up @@ -59,7 +58,7 @@ func TestCreate(t *testing.T) {
Name: "notvalid",
},
},
secret: &apiv1.Secret{
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "notvalid",
},
Expand Down Expand Up @@ -406,11 +405,11 @@ func TestGetUserData(t *testing.T) {
reconciler := newReconciler(&machineScope)

testCases := []struct {
secret *apiv1.Secret
secret *corev1.Secret
error error
}{
{
secret: &apiv1.Secret{
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: userDataSecretName,
Namespace: defaultNamespace,
Expand All @@ -422,7 +421,7 @@ func TestGetUserData(t *testing.T) {
error: nil,
},
{
secret: &apiv1.Secret{
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "notFound",
Namespace: defaultNamespace,
Expand All @@ -434,7 +433,7 @@ func TestGetUserData(t *testing.T) {
error: &machinecontroller.MachineError{},
},
{
secret: &apiv1.Secret{
secret: &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: userDataSecretName,
Namespace: defaultNamespace,
Expand Down
5 changes: 2 additions & 3 deletions pkg/cloud/gcp/actuators/machineset/controller_test.go
View file
Open in desktop
Expand Up @@ -24,7 +24,6 @@ import (
. "github.com/onsi/gomega"
gtypes "github.com/onsi/gomega/types"
machineproviderv1 "github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1"
providerconfigv1 "github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1"
computeservice "github.com/openshift/cluster-api-provider-gcp/pkg/cloud/gcp/actuators/services/compute"
machinev1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
"google.golang.org/api/compute/v1"
Expand Down Expand Up @@ -73,7 +72,7 @@ var _ = Describe("Reconciler", func() {
Client: mgr.GetClient(),
Log: log.Log,

getGCPService: func(_ string, _ providerconfigv1.GCPMachineProviderSpec) (computeservice.GCPComputeService, error) {
getGCPService: func(_ string, _ machineproviderv1.GCPMachineProviderSpec) (computeservice.GCPComputeService, error) {
return service, nil
},
}
Expand Down Expand Up @@ -298,7 +297,7 @@ func TestReconcile(t *testing.T) {

r := &Reconciler{
cache: newMachineTypesCache(),
getGCPService: func(_ string, _ providerconfigv1.GCPMachineProviderSpec) (computeservice.GCPComputeService, error) {
getGCPService: func(_ string, _ machineproviderv1.GCPMachineProviderSpec) (computeservice.GCPComputeService, error) {
return service, nil
},
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/cloud/gcp/actuators/util/gcp_credentials.go
View file
Open in desktop
Expand Up @@ -25,7 +25,6 @@ import (
"golang.org/x/oauth2/google"
apicorev1 "k8s.io/api/core/v1"
apimachineryerrors "k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"
controllerclient "sigs.k8s.io/controller-runtime/pkg/client"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Potentially would have kept client over controllerclient, but I can see that causing clashes, tough decision 🤔

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would agree that having client over controllerclient is more preferable, as we primary use the first one anywhere else.

)

Expand All @@ -50,7 +49,7 @@ func GetCredentialsSecret(coreClient controllerclient.Client, namespace string,
}
var credentialsSecret apicorev1.Secret

if err := coreClient.Get(context.Background(), client.ObjectKey{Namespace: namespace, Name: spec.CredentialsSecret.Name}, &credentialsSecret); err != nil {
if err := coreClient.Get(context.Background(), controllerclient.ObjectKey{Namespace: namespace, Name: spec.CredentialsSecret.Name}, &credentialsSecret); err != nil {
if apimachineryerrors.IsNotFound(err) {
machineapierros.InvalidMachineConfiguration("credentials secret %q in namespace %q not found: %v", spec.CredentialsSecret.Name, namespace, err.Error())
}
Expand Down