post-rebase cleanup

Signed-off-by: rbtr <[email protected]>

api/v1alpha3/awsprincipal_types.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package v1alpha3
 
 import (

controllers/awsmachine_controller.go

@@ -827,6 +827,7 @@ func (r *AWSMachineReconciler) getInfraCluster(ctx context.Context, log logr.Log
 			Client:               r.Client,
 			Logger:               log,
 			Cluster:              cluster,
+			AWSCluster:           awsCluster,
 			ExternalInfraCluster: externalInfraCluster,
 			ControllerName:       "externalInfraCluster",
 		})

controlplane/eks/controllers/awsmanagedcontrolplane_controller.go

@@ -146,7 +146,6 @@ func (r *AWSManagedControlPlaneReconciler) Reconcile(req ctrl.Request) (res ctrl
 		return ctrl.Result{Requeue: true}, nil
 	}
 
-
 	if util.IsPaused(cluster, awsControlPlane) {
 		logger.Info("Reconciliation is paused for this object")
 		return ctrl.Result{}, nil
@@ -158,7 +157,7 @@ func (r *AWSManagedControlPlaneReconciler) Reconcile(req ctrl.Request) (res ctrl
 		Client:               r.Client,
 		Logger:               logger,
 		Cluster:              cluster,
-		AWSCluster:			  awsCluster,
+		AWSCluster:           awsCluster,
 		ControlPlane:         awsControlPlane,
 		ControllerName:       "awsmanagedcontrolplane",
 		EnableIAM:            r.EnableIAM,

exp/controllers/awsmanagedmachinepool_controller.go

@@ -40,6 +40,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
+	infrav1 "sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3"
 	controlplanev1 "sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1alpha3"
 	infrav1exp "sigs.k8s.io/cluster-api-provider-aws/exp/api/v1alpha3"
 	"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/scope"
@@ -139,11 +140,25 @@ func (r *AWSManagedMachinePoolReconciler) Reconcile(req ctrl.Request) (_ ctrl.Re
 		return ctrl.Result{}, nil
 	}
 
+	awsCluster := &infrav1.AWSCluster{}
+
+	infraClusterName := client.ObjectKey{
+		Namespace: machinePool.Namespace,
+		Name:      cluster.Spec.InfrastructureRef.Name,
+	}
+
+	if err := r.Client.Get(ctx, infraClusterName, awsCluster); err != nil {
+		// AWSCluster is not ready
+		logger.Info("AWSCluster is not ready")
+		return reconcile.Result{}, nil
+	}
+
 	machinePoolScope, err := scope.NewManagedMachinePoolScope(scope.ManagedMachinePoolScopeParams{
 		Logger:             logger,
 		Client:             r.Client,
 		ControllerName:     "awsmanagedmachinepool",
 		Cluster:            cluster,
+		AWSCluster:         awsCluster,
 		ControlPlane:       controlPlane,
 		MachinePool:        machinePool,
 		ManagedMachinePool: awsPool,

pkg/cloud/scope/externalinfracluster.go

@@ -36,6 +36,7 @@ type ExternalInfraClusterScopeParams struct {
 	Client               client.Client
 	Logger               logr.Logger
 	Cluster              *clusterv1.Cluster
+	AWSCluster           *infrav1.AWSCluster
 	ExternalInfraCluster *unstructured.Unstructured
 	ControllerName       string
 	Endpoints            []ServiceEndpoint
@@ -60,7 +61,7 @@ func NewExternalInfraClusterScope(params ExternalInfraClusterScopeParams) (*Exte
 	if err != nil || !found {
 		return nil, fmt.Errorf("error getting region: %w", err)
 	}
-	session, err := sessionForRegion(region, params.Endpoints)
+	session, err := sessionForClusterWithRegion(params.Client, params.AWSCluster, region, params.Endpoints, params.Logger)
 	if err != nil {
 		return nil, errors.Errorf("failed to create aws session: %v", err)
 	}

pkg/cloud/scope/managednodegroup.go

@@ -41,6 +41,7 @@ type ManagedMachinePoolScopeParams struct {
 	Client             client.Client
 	Logger             logr.Logger
 	Cluster            *clusterv1.Cluster
+	AWSCluster         *infrav1.AWSCluster
 	ControlPlane       *controlplanev1exp.AWSManagedControlPlane
 	ManagedMachinePool *infrav1exp.AWSManagedMachinePool
 	MachinePool        *clusterv1exp.MachinePool
@@ -64,7 +65,7 @@ func NewManagedMachinePoolScope(params ManagedMachinePoolScopeParams) (*ManagedM
 		params.Logger = klogr.New()
 	}
 
-	session, err := sessionForRegion(params.ControlPlane.Spec.Region, params.Endpoints)
+	session, err := sessionForClusterWithRegion(params.Client, params.AWSCluster, params.ControlPlane.Spec.Region, params.Endpoints, params.Logger)
 	if err != nil {
 		return nil, errors.Errorf("failed to create aws session: %v", err)
 	}

pkg/cloud/scope/principal.go

@@ -1,9 +1,26 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package scope
 
 import (
 	"bytes"
 	"crypto/sha256"
 	"encoding/gob"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/credentials"
 	"github.com/aws/aws-sdk-go/aws/credentials/stscreds"

pkg/cloud/scope/session_test.go

@@ -1,7 +1,25 @@
+/*
+Copyright 2019 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package scope
 
 import (
 	"context"
+	"testing"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
@@ -12,7 +30,6 @@ import (
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/api/v1alpha3"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-	"testing"
 )
 
 func TestPrincipalParsing(t *testing.T) {