Merge branch 'master' into master

api/v1alpha1/instancegroup_types_test.go

@@ -461,7 +461,6 @@ func TestInstanceGroupSpecValidate(t *testing.T) {
 func TestScalingConfigOverride(t *testing.T) {
 	launchconfiguration := LaunchConfiguration
 	launchtemplate := LaunchTemplate
-
 	var invalidScalingConfigType ScalingConfigurationType = "invalid-scaling-config-type"
 
 	type args struct {
@@ -529,7 +528,7 @@ func TestScalingConfigOverride(t *testing.T) {
 			err := testFunction(t, tt.args)
 			if (!tt.expectedError && err != "") || (tt.expectedError && err == "") {
 				t.Errorf("%v: got: %v, expectedError: %v", tt.name, err, tt.expectedError)
-			}
+      }
 			got := tt.args.instancegroup.Spec.EKSSpec.Type
 			if got != tt.want {
 				t.Errorf("%v: got %v, want %v", tt.name, got, tt.want)

main.go

@@ -89,7 +89,6 @@ func main() {
 	flag.BoolVar(&nodeRelabel, "node-relabel", true, "relabel nodes as they join with kubernetes.io/role label via controller")
 	flag.BoolVar(&disableWinClusterInjection, "disable-windows-cluster-ca-injection", false, "Setting this to true will cause the ClusterCA and Endpoint to not be injected for Windows nodes")
 	flag.StringVar(&defaultScalingConfiguration, "default-scaling-configuration", "LaunchTemplate", "By default ASGs will have LaunchTemplate. Set this string to either 'LaunchConfiguration' or 'LaunchTemplate' to enforce defaults.")
-
 	flag.Parse()
 	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))