Multi Dataset Account ChR (#1256)

Author: alesnovak-s1

.github/actions/install-k8s-agent/action.yml

@@ -9,15 +9,6 @@ inputs:
   scalyr_api_key:
     description: "Write API key to be used by the agent."
     required: true
-  scalyr_api_key_team_2:
-    description: "Write API key to be used by the agent."
-    required: false
-  scalyr_api_key_team_3:
-    description: "Write API key to be used by the agent."
-    required: false
-  scalyr_api_key_team_4:
-    description: "Write API key to be used by the agent."
-    required: false
   scalyr_cluster_name:
     description: "Cluster name to use."
     required: true
@@ -90,21 +81,6 @@ runs:
         # Define api key
         kubectl create secret generic scalyr-api-key --namespace scalyr --from-literal=scalyr-api-key="${{ inputs.scalyr_api_key }}"
         
-        # Create a secret if the scalyr_api_key_team_2 is set
-        if [ ! -z "${{ inputs.scalyr_api_key_team_2 }}" ]; then
-          kubectl create secret generic scalyr-api-key-team-2 --namespace scalyr --from-literal=scalyr-api-key="${{ inputs.scalyr_api_key_team_2 }}"
-        fi
-        
-        # Create a secret if the scalyr_api_key_team_3 is set
-        if [ ! -z "${{ inputs.scalyr_api_key_team_3 }}" ]; then
-          kubectl create secret generic scalyr-api-key-team-3 --namespace scalyr --from-literal=scalyr-api-key="${{ inputs.scalyr_api_key_team_3 }}"
-        fi
-        
-        # Create a secret if the scalyr_api_key_team_4 is set
-        if [ ! -z "${{ inputs.scalyr_api_key_team_4 }}" ]; then
-          kubectl create secret generic scalyr-api-key-team-4 --namespace scalyr --from-literal=scalyr-api-key="${{ inputs.scalyr_api_key_team_4 }}"
-        fi
-
         # Create configmap
         kubectl create configmap --namespace scalyr scalyr-config \
           --from-literal=SCALYR_K8S_CLUSTER_NAME="${{ inputs.scalyr_cluster_name }}" \

.github/workflows/agent-build-new.yml

@@ -93,9 +93,15 @@ jobs:
       SCALYR_API_KEY_READ_2: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_2_READ }}
       SCALYR_API_KEY_READ_3: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_3_READ }}
       SCALYR_API_KEY_READ_4: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_4_READ }}
+      SCALYR_API_KEY_READ_5: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_5_READ }}
+      SCALYR_API_KEY_READ_6: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_6_READ }}
+      SCALYR_API_KEY_READ_7: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_7_READ }}
       SCALYR_API_KEY_WRITE_2: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_2_WRITE }}
       SCALYR_API_KEY_WRITE_3: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_3_WRITE }}
       SCALYR_API_KEY_WRITE_4: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_4_WRITE }}
+      SCALYR_API_KEY_WRITE_5: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_5_WRITE }}
+      SCALYR_API_KEY_WRITE_6: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_6_WRITE }}
+      SCALYR_API_KEY_WRITE_7: ${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_7_WRITE }}
       PULL_REGISTRY_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME_PROD_ACCOUNT }}
       PULL_REGISTRY_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD_PROD_ACCOUNT }}
       PUBLISH_REGISTRY_USERNAME: ${{ (github.ref_type == 'tag' || github.ref_name == 'master') && secrets.DOCKER_HUB_USERNAME_PROD_ACCOUNT || secrets.DOCKER_HUB_USERNAME_TEST_ACCOUNT }}

.github/workflows/reusable-agent-build-container-images.yml

@@ -50,12 +50,24 @@ on:
         required: true
       SCALYR_API_KEY_READ_4:
         required: true
+      SCALYR_API_KEY_READ_5:
+        required: true
+      SCALYR_API_KEY_READ_6:
+        required: true
+      SCALYR_API_KEY_READ_7:
+        required: true
       SCALYR_API_KEY_WRITE_2:
         required: true
       SCALYR_API_KEY_WRITE_3:
         required: true
       SCALYR_API_KEY_WRITE_4:
         required: true
+      SCALYR_API_KEY_WRITE_5:
+        required: true
+      SCALYR_API_KEY_WRITE_6:
+        required: true
+      SCALYR_API_KEY_WRITE_7:
+        required: true
       PULL_REGISTRY_USERNAME:
         required: true
       PULL_REGISTRY_PASSWORD:
@@ -316,6 +328,12 @@ jobs:
         with:
           driver-opts: network=host
 
+      - name: Login to DockerHub
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
+        with:
+          username: ${{ secrets.PULL_REGISTRY_USERNAME }}
+          password: ${{ secrets.PULL_REGISTRY_PASSWORD }}
+
       - name: Install Scalyr tool
         run: |
           curl https://raw.githubusercontent.com/scalyr/scalyr-tool/master/scalyr > scalyr
@@ -330,6 +348,13 @@ jobs:
           container_runtime: "${{ matrix.k8s_version.runtime }}"
           github_token: "${{ secrets.GITHUB_TOKEN }}"
 
+      - name: Preload minikube images
+        run: |
+          # Since the minikube runtimes we use cannot be reasonably configured to use custom credentials for docker hub, 
+          # we need to pull the images and load them into minikube.
+          docker pull busybox:1.28
+          minikube image load busybox:1.28
+
       - name: Download OCI tarball of the built image.
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3
         with:
@@ -381,11 +406,9 @@ jobs:
           minikube image ls
           kubectl apply -f tests/e2e/k8s_k8s_monitor/std_printer_deployment.yaml
           kubectl apply -f tests/e2e/k8s_k8s_monitor/long_message_printer_deployment.yaml
-          kubectl apply -f tests/e2e/k8s_k8s_monitor/multiple_account_printers.yaml
           
           kubectl wait --for=condition=ready pod -l app=std-printer
           kubectl wait --for=condition=ready pod -l app=long-message-printer
-          kubectl wait --for=condition=ready pod -l app=multiple-account-printer
           kubectl get pods -A
 
           export APP_POD_NAME=$(kubectl get pod --namespace=default --selector=app=std-printer -o jsonpath="{.items[0].metadata.name}")
@@ -394,7 +417,18 @@ jobs:
 
           echo ""
           kubectl logs "${APP_POD_NAME}"
-          echo ""
+          echo "" 
+
+      - name: Create mock pods for multi account printer
+        env:
+          scalyr_api_key_write_team_2: "${{ secrets.SCALYR_API_KEY_WRITE_2 }}"
+          scalyr_api_key_write_team_3: "${{ secrets.SCALYR_API_KEY_WRITE_3 }}"
+          scalyr_api_key_write_team_4: "${{ secrets.SCALYR_API_KEY_WRITE_4 }}"
+          scalyr_api_key_write_team_5: "${{ secrets.SCALYR_API_KEY_WRITE_5 }}"
+          scalyr_api_key_write_team_6: "${{ secrets.SCALYR_API_KEY_WRITE_6 }}"
+          scalyr_api_key_write_team_7: "${{ secrets.SCALYR_API_KEY_WRITE_7 }}"
+        run: |
+          tests/e2e/k8s_k8s_monitor/multiple_account_printers/deploy.sh
 
       # We create mock CronJob so we can assert that Kubernetes Events monitor correctly handles
       # CronJob and Job Events.
@@ -567,22 +601,32 @@ jobs:
           ./scripts/cicd/scalyr-query.sh '$serverHost="'${SCALYR_AGENT_POD_NAME}'" "Message from short-lived-container-2"'
           ./scripts/cicd/scalyr-query.sh '$serverHost="'${SCALYR_AGENT_POD_NAME}'" "Message from short-lived-container-3"'
 
+      - name: Install Testing Python Packages
+        run: |
+          python3 -m pip install kubernetes tabulate
+
       - name: Verify multiaccount records have been ingested
         timeout-minutes: 14
         env:
-          scalyr_api_key_team: "${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_READ }}"
-          scalyr_api_key_team_2: "${{ secrets.SCALYR_API_KEY_READ_2 }}"
-          scalyr_api_key_team_3: "${{ secrets.SCALYR_API_KEY_READ_3 }}"
-          scalyr_api_key_team_4: "${{ secrets.SCALYR_API_KEY_READ_4 }}"
-          SCALYR_AGENT_POD_NAME: "${{ env.SCALYR_AGENT_POD_NAME }}"
-          ACCOUNT_NAME: "[email protected]"
+          SCALYR_API_KEY_READ_TEAM_1: "${{ secrets.CT_SCALYR_TOKEN_PROD_US_CLOUDTECH_TESTING_READ }}"
+          SCALYR_API_KEY_READ_TEAM_2: "${{ secrets.SCALYR_API_KEY_READ_2 }}"
+          SCALYR_API_KEY_READ_TEAM_3: "${{ secrets.SCALYR_API_KEY_READ_3 }}"
+          SCALYR_API_KEY_READ_TEAM_4: "${{ secrets.SCALYR_API_KEY_READ_4 }}"
+          SCALYR_API_KEY_READ_TEAM_5: "${{ secrets.SCALYR_API_KEY_READ_5 }}"
+          SCALYR_API_KEY_READ_TEAM_6: "${{ secrets.SCALYR_API_KEY_READ_6 }}"
+          SCALYR_API_KEY_READ_TEAM_7: "${{ secrets.SCALYR_API_KEY_READ_7 }}"
+          SERVER_HOST: "${{ env.SCALYR_AGENT_POD_NAME }}"
+          ACCOUNT_NAME_1: "[email protected]"
           ACCOUNT_NAME_2: "[email protected]"
           ACCOUNT_NAME_3: "[email protected]"
           ACCOUNT_NAME_4: "[email protected]"
+          ACCOUNT_NAME_5: "[email protected]"
+          ACCOUNT_NAME_6: "[email protected]"
+          ACCOUNT_NAME_7: "[email protected]"
         run: |
           echo 'Looking for multiple account logs'
           
-          ./scripts/cicd/verify-multiaccount-records-have-been-ingested.sh
+          ./scripts/cicd/verify-multiaccount-records-have-been-ingested.py
 
       - name: Notify Slack on Failure
         if: ${{ failure() && github.ref_name == 'master' }}