test: Add GetTemplate and idempotently create namespace (#4091)

aws · Jun 21, 2023 · c74d4db · c74d4db
1 parent 63f76f3
commit c74d4db
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/.github/actions/e2e/install-karpenter/action.yaml b/.github/actions/e2e/install-karpenter/action.yaml
@@ -28,12 +28,17 @@ runs:
     with:
       ref: ${{ inputs.git_ref }}
   - uses: ./.github/actions/e2e/install-helm
+  - name: create karpenter namespace
+    shell: bash
+    run: |
+      kubectl create ns karpenter || true
+      kubectl label ns karpenter scrape=enabled --overwrite=true
   - name: install-karpenter
     shell: bash
     run: |
       aws eks update-kubeconfig --name ${{ inputs.cluster_name }}
-      helm upgrade --install --namespace karpenter --create-namespace \
-        karpenter oci://public.ecr.aws/karpenter/karpenter \
+      helm upgrade --install karpenter oci://public.ecr.aws/karpenter/karpenter \
+        -n karpenter \
         --version v0-$(git rev-parse HEAD) \
         --set serviceAccount.annotations."eks\.amazonaws\.com/role-arn"="arn:aws:iam::${{ inputs.account_id }}:role/karpenter-irsa-${{ inputs.cluster_name }}" \
         --set settings.aws.clusterName=${{ inputs.cluster_name }} \

diff --git a/.github/actions/e2e/install-prometheus/action.yaml b/.github/actions/e2e/install-prometheus/action.yaml
@@ -32,13 +32,13 @@ runs:
     - name: create prometheus namespace
       shell: bash
       run: |
-        kubectl create ns prometheus
-        kubectl label ns prometheus scrape=enabled
+        kubectl create ns prometheus || true
+        kubectl label ns prometheus scrape=enabled --overwrite=true
     - name: install prometheus
       shell: bash
       run: |
         helm upgrade --install prometheus prometheus-community/kube-prometheus-stack \
-          -n prometheus --create-namespace \
+          -n prometheus \
           -f ./.github/actions/e2e/install-prometheus/values.yaml \
           --set prometheus.prometheusSpec.remoteWrite[0].url=https://aps-workspaces.${{ inputs.region }}.amazonaws.com/workspaces/${{ inputs.workspace_id }}/api/v1/remote_write \
           --set prometheus.prometheusSpec.remoteWrite[0].sigv4.region=${{ inputs.region }} \

diff --git a/.github/actions/e2e/install-prometheus/values.yaml b/.github/actions/e2e/install-prometheus/values.yaml
@@ -26,6 +26,10 @@ alertmanager:
     tolerations:
       - key: CriticalAddonsOnly
         operator: Exists
+kubelet:
+  serviceMonitor:
+    additionalLabels:
+      scrape: enabled
 prometheus:
   prometheusSpec:
     tolerations:
@@ -38,6 +42,12 @@ prometheus:
       limits:
         cpu: 1
         memory: 5Gi
+    serviceMonitorSelector:
+      matchLabels:
+        scrape: enabled
+    serviceMonitorNamespaceSelector:
+      matchLabels:
+        scrape: enabled
     remoteWrite:
       - queueConfig:
           maxSamplesPerSend: 1000

diff --git a/test/gha/cloudformation/iam_cloudformation.yaml b/test/gha/cloudformation/iam_cloudformation.yaml
@@ -97,6 +97,7 @@ Resources:
               - cloudformation:DescribeStackEvents
               - cloudformation:ExecuteChangeSet
               - cloudformation:ListStacks
+              - cloudformation:GetTemplate
               - cloudformation:GetTemplateSummary
             Resource: !Sub "arn:${AWS::Partition}:cloudformation:${AWS::Region}:${AWS::AccountId}:stack/*"
           - Effect: Allow