Merge pull request #250 from alebedev87/release-1.2-konflux-container

Cherry pick fixes for e2e tests

Author: alebedev87

hack/controller/README.md

@@ -20,6 +20,6 @@ This `CrendetialsRequest` is a compact ("minified") version of the source IAM po
 This allows it to be created by both the Cloud Credential Operator and `ccoctl`.   
 Currently, this `CrendetialsRequest` is used in two places:
 - by the operator [to ensure `CredentialsRequest` CR](https://github.com/openshift/aws-load-balancer-operator/blob/a846cc27dc0f08adbf404714d308ded7f2cddebe/pkg/controllers/awsloadbalancercontroller/credentials_request.go#L145) during `AWSLoadBalancerController` reconciliation
-- by [the aws-load-balancer pre-install CI step](https://github.com/openshift/release/blob/d797eff6740de41ee2793866f358b246e2b52ae4/ci-operator/step-registry/aws-load-balancer/pre-install/aws-load-balancer-pre-install-commands.sh#L14) to create a secret for [some e2e test cases](https://github.com/openshift/aws-load-balancer-operator/blob/a846cc27dc0f08adbf404714d308ded7f2cddebe/test/e2e/operator_test.go#L324).
+- by the operator e2e tests to create a secret for [some e2e test cases](https://github.com/openshift/aws-load-balancer-operator/blob/a846cc27dc0f08adbf404714d308ded7f2cddebe/test/e2e/operator_test.go#L324).
 
 **Note**: this `CredentialsRequest` has broader permissions than the source IAM policy!

test/e2e/operator_test.go

@@ -42,6 +42,7 @@ import (
 
 	albo "github.com/openshift/aws-load-balancer-operator/api/v1"
 	albov1alpha1 "github.com/openshift/aws-load-balancer-operator/api/v1alpha1"
+	"github.com/openshift/aws-load-balancer-operator/pkg/controllers/awsloadbalancercontroller"
 )
 
 const (
@@ -58,9 +59,6 @@ const (
 	// controllerRoleARNVarName contains IAM role ARN to be used by the controller on a ROSA/STS cluster.
 	controllerRoleARNVarName = "ALBO_E2E_CONTROLLER_ROLE_ARN"
 
-	// controllerSecretName is the name of the controller's cloud credential secret provisioned by the CI.
-	controllerSecretName = "aws-load-balancer-controller-cluster"
-
 	// awsLoadBalancerControllerContainerName is the name of the AWS load balancer controller's container.
 	awsLoadBalancerControllerContainerName = "controller"
 )
@@ -85,6 +83,10 @@ var (
 		Name:      "aws-load-balancer-operator-e2e",
 		Namespace: operatorNamespace,
 	}
+	controllerSecretName = types.NamespacedName{
+		Name:      "aws-load-balancer-controller-cluster",
+		Namespace: operatorNamespace,
+	}
 	controllerRoleARN string
 )
 
@@ -134,6 +136,10 @@ func TestMain(m *testing.M) {
 			fmt.Printf("failed to create credentialsrequest for e2e: %s\n", err)
 			os.Exit(1)
 		}
+		if err := ensureControllerCredentialsRequest(controllerSecretName); err != nil {
+			fmt.Printf("failed to create credentialsrequest for controller: %s\n", err)
+			os.Exit(1)
+		}
 		cfg, err = awsConfigWithCredentials(context.TODO(), kubeClient, infra.Status.PlatformStatus.AWS.Region, e2eSecretName)
 		if err != nil {
 			fmt.Printf("failed to load aws config %v\n", err)
@@ -256,7 +262,7 @@ func TestAWSLoadBalancerControllersV1Alpha1(t *testing.T) {
 
 	// The additional resource tags and the credentials secret are added to ALBC
 	// because they changed in v1.
-	alb := newALBCBuilder().withResourceTags(map[string]string{"testtag": "testval"}).withCredSecret(controllerSecretName).buildv1alpha1()
+	alb := newALBCBuilder().withResourceTags(map[string]string{"testtag": "testval"}).withCredSecret(controllerSecretName.Name).buildv1alpha1()
 	if err := kubeClient.Create(context.TODO(), alb); err != nil {
 		t.Fatalf("failed to create aws load balancer controller: %v", err)
 	}
@@ -334,7 +340,7 @@ func TestAWSLoadBalancerControllerWithCredentialsSecret(t *testing.T) {
 	}()
 
 	t.Log("Creating aws load balancer controller instance with credentials secret")
-	alb := newALBCBuilder().withCredSecret(controllerSecretName).build()
+	alb := newALBCBuilder().withCredSecret(controllerSecretName.Name).build()
 	if err := kubeClient.Create(context.TODO(), alb); err != nil {
 		t.Fatalf("failed to create aws load balancer controller: %v", err)
 	}
@@ -717,6 +723,7 @@ func TestAWSLoadBalancerControllerWithWAFv2(t *testing.T) {
 }
 
 func TestAWSLoadBalancerControllerWithWAFRegional(t *testing.T) {
+	t.Skip("Skipping this test for now as creation of WAF Classic ACLs is deprecated (OCPBUGS-57320)")
 	t.Log("Getting WAFRegional WebACL")
 	var webACLID string
 	if !stsModeRequested() {
@@ -1425,6 +1432,38 @@ func ensureCredentialsRequest(secret types.NamespacedName) error {
 	return nil
 }
 
+// ensureControllerCredentialsRequest creates CredentialsRequest to provision a secret with the cloud credentials
+// required by the controller in some of the e2e tests.
+func ensureControllerCredentialsRequest(secret types.NamespacedName) error {
+	providerSpec, err := cco.Codec.EncodeProviderSpec(&cco.AWSProviderSpec{
+		StatementEntries: awsloadbalancercontroller.GetIAMPolicyMinify().Statement,
+	})
+	if err != nil {
+		return err
+	}
+
+	cr := cco.CredentialsRequest{
+		ObjectMeta: v1.ObjectMeta{
+			Name:      "aws-load-balancer-controller",
+			Namespace: "openshift-cloud-credential-operator",
+		},
+		Spec: cco.CredentialsRequestSpec{
+			SecretRef: corev1.ObjectReference{
+				Name:      secret.Name,
+				Namespace: secret.Namespace,
+			},
+			ServiceAccountNames: []string{"aws-load-balancer-controller-cluster"},
+			ProviderSpec:        providerSpec,
+		},
+	}
+
+	if err = kubeClient.Create(context.Background(), &cr); err != nil && !errors.IsAlreadyExists(err) {
+		return err
+	}
+
+	return nil
+}
+
 func createTestWorkload(t *testing.T, namespace string) *corev1.Service {
 	t.Helper()
 	return createTestWorkloadWithCustomize(t, namespace, nil)