Merge pull request aws-ia#276 from aws-samples/control-plane-consistency

chore: Work to make control plane modules consistent with rest of workshop

.github/workflows/e2e-tests.yaml

@@ -17,8 +17,6 @@ jobs:
 
     name: run-tests
     runs-on: ubuntu-latest
-    #concurrency: test-environment
-    timeout-minutes: 120
     steps:
     - name: Check out code
       uses: actions/checkout@v2
@@ -105,20 +103,13 @@ jobs:
         DEV_MODE: 1
       run: |
         make test terraform_context="test/terraform" module="observability"
-    - name: Run tests - Cost optimization
-      if: ${{ github.event_name == 'workflow_dispatch' || contains( github.event.pull_request.labels.*.name, 'content/cost-optimization') }}
-      env:
-        DOCKER_BUILDKIT: 1
-        DEV_MODE: 1
-      run: |
-        make test terraform_context="test/terraform" module="costoptimization"
     - name: Run tests - Automation
       if: ${{ github.event_name == 'workflow_dispatch' || contains( github.event.pull_request.labels.*.name, 'content/automation') }}
       env:
         DOCKER_BUILDKIT: 1
         DEV_MODE: 1
       run: |
-        AWS_EKS_WORKSHOP_TEST_FLAGS="--debug" make test terraform_context="test/terraform" module="gitops"
+        make test terraform_context="test/terraform" module="automation"
     - name: Run tests - Cleanup
       if: always()
       env:

environment/bin/reset-environment

@@ -24,12 +24,22 @@ kubectl apply -k $absolute_path --prune --all \
   --prune-whitelist=apps/v1/Deployment \
   --prune-whitelist=apps/v1/StatefulSet \
   --prune-whitelist=core/v1/ServiceAccount \
+  --prune-whitelist=core/v1/Secret \
   --prune-whitelist=core/v1/PersistentVolumeClaim \
   --prune-whitelist=karpenter.sh/v1alpha5/Provisioner \
   --prune-whitelist=scheduling.k8s.io/v1/PriorityClass \
   --prune-whitelist=opentelemetry.io/v1alpha1/OpenTelemetryCollector \
   --prune-whitelist=crd.k8s.amazonaws.com/v1alpha1/ENIConfig \
   --prune-whitelist=vpcresources.k8s.aws/v1beta1/SecurityGroupPolicy \
+  --prune-whitelist=database.aws.crossplane.io/v1beta1/DBSubnetGroup \
+  --prune-whitelist=rds.aws.crossplane.io/v1alpha1/DBInstance \
+  --prune-whitelist=ec2.aws.crossplane.io/v1beta1/SecurityGroup \
+  --prune-whitelist=apiextensions.crossplane.io/v1/Composition \
+  --prune-whitelist=apiextensions.crossplane.io/v1/CompositeResourceDefinition \
+  --prune-whitelist=services.k8s.aws/v1alpha1/FieldExport \
+  --prune-whitelist=rds.services.k8s.aws/v1alpha1/DBSubnetGroup \
+  --prune-whitelist=rds.services.k8s.aws/v1alpha1/DBInstance \
+  --prune-whitelist=ec2.services.k8s.aws/v1alpha1/SecurityGroup \
   --prune-whitelist=networking.k8s.io/v1/Ingress > /dev/null
 
 echo "Waiting for application to become ready..."

environment/bin/wait-for-lb

@@ -8,13 +8,13 @@ echo "Waiting for ${host}..."
 
 EXIT_CODE=0
 
-timeout -s TERM 180 bash -c \
+timeout -s TERM 600 bash -c \
   'while [[ "$(curl -s -o /dev/null -L -w ''%{http_code}'' ${host}/home)" != "200" ]];\
   do sleep 5;\
   done' || EXIT_CODE=$?
 
 if [ $EXIT_CODE -ne 0 ]; then
-  echo "Load balancer did not become available or return HTTP 200 for 180 seconds"
+  echo "Load balancer did not become available or return HTTP 200 for 600 seconds"
   exit 1
 fi