Add Ubuntu AMI for Canary Tests

Author: Supreeth095

.github/workflows/weekly-cron-tests.yaml

@@ -57,3 +57,14 @@ jobs:
         run: |
           ./scripts/run-integration-tests.sh
         if: always()
+      - name: Run ubuntu tests
+        env:
+          DISABLE_PROMPT: true
+          ROLE_CREATE: false
+          ROLE_ARN: ${{ secrets.EKS_CLUSTER_ROLE_ARN }}
+          RUN_CNI_INTEGRATION_TESTS: false
+          RUN_UBUNTU_TEST: true
+        run: |
+          ./scripts/run-integration-tests.sh
+        if: always()
+

scripts/lib/cluster.sh

@@ -30,6 +30,9 @@ function up-test-cluster() {
     if [[ "$RUN_BOTTLEROCKET_TEST" == true ]]; then
         echo "Copying bottlerocket config to $CLUSTER_CONFIG"
         cp $CLUSTER_TEMPLATE_PATH/bottlerocket.yaml $CLUSTER_CONFIG
+    elif [[ "$RUN_UBUNTU_TEST" == true ]]; then
+        echo "Copying ubuntu config to $CLUSTER_CONFIG"
+        cp $CLUSTER_TEMPLATE_PATH/ubuntu.yaml $CLUSTER_CONFIG
     elif [[ "$RUN_PERFORMANCE_TESTS" == true ]]; then
         echo "Copying perf test cluster config to $CLUSTER_CONFIG"
         cp $CLUSTER_TEMPLATE_PATH/perf-cluster.yml $CLUSTER_CONFIG

scripts/run-integration-tests.sh

@@ -28,6 +28,7 @@ ARCH=$(go env GOARCH)
 : "${RUN_CONFORMANCE:=false}"
 : "${RUN_KOPS_TEST:=false}"
 : "${RUN_BOTTLEROCKET_TEST:=false}"
+: "${RUN_UBUNTU_TEST:=false}"
 : "${RUN_PERFORMANCE_TESTS:=false}"
 : "${RUNNING_PERFORMANCE:=false}"
 : "${KOPS_VERSION=v1.33.0-beta.1}"
@@ -54,6 +55,9 @@ on_error() {
     if [[ $RUN_BOTTLEROCKET_TEST == true ]]; then
         emit_cloudwatch_metric "bottlerocket_test_status" "0"
     fi
+    if [[ $RUN_UBUNTU_TEST == true ]]; then
+        emit_cloudwatch_metric "ubuntu_test_status" "0"
+    fi
     if [[ $RUN_PERFORMANCE_TESTS == true ]]; then
         emit_cloudwatch_metric "performance_test_status" "0"
     fi
@@ -296,6 +300,9 @@ if [[ "$DEPROVISION" == true ]]; then
     elif [[ "$RUN_BOTTLEROCKET_TEST" == true ]]; then
         eksctl delete cluster $CLUSTER_NAME --disable-nodegroup-eviction
         emit_cloudwatch_metric "bottlerocket_test_status" "1"
+    elif [[ "$RUN_UBUNTU_TEST" == true ]]; then
+        eksctl delete cluster $CLUSTER_NAME --disable-nodegroup-eviction
+        emit_cloudwatch_metric "ubuntu_test_status" "1"
     elif [[ "$RUN_PERFORMANCE_TESTS" == true ]]; then
         eksctl delete cluster $CLUSTER_NAME
         emit_cloudwatch_metric "performance_test_status" "1"

scripts/run-release-tests.sh

@@ -4,6 +4,12 @@ echo "Running bottlerocket test"
 ./scripts/run-integration-tests.sh
 unset RUN_BOTTLEROCKET_TEST
 
+export RUN_UBUNTU_TEST=true
+chmod +x ./scripts/run-integration-tests.sh
+echo "Running ubuntu test"
+./scripts/run-integration-tests.sh
+unset RUN_UBUNTU_TEST
+
 export RUN_WARM_IP_TEST=true
 echo "Running warm ip test"
 ./scripts/run-integration-tests.sh

scripts/test/config/ubuntu.yaml

@@ -0,0 +1,22 @@
+---
+apiVersion: eksctl.io/v1alpha5
+kind: ClusterConfig
+
+metadata:
+  name: CLUSTER_NAME_PLACEHOLDER
+  region: us-west-2
+
+nodeGroups:
+  - name: ng-ubuntu
+    instanceType: m5.large
+    desiredCapacity: 4
+    amiFamily: UbuntuPro2404
+    iam:
+       attachPolicyARNs:
+          - arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy
+          - arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy
+          - arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly
+          - arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
+    ubuntu:
+      settings:
+        motd: "Hello from eksctl!"

test/README.md

@@ -26,6 +26,9 @@ Ginkgo Focus: [SMOKE]
 # Bottlerocket
     * set RUN_BOTTLEROCKET_TEST=true
 
+# Ubuntu
+    * set RUN_UBUNTU_TEST=true
+
 ## How to Manually delete k8s tester Resources (order of deletion)
 Cloudformation - (all except cluster, vpc)
 EC2 - load balancers, key pair