Testing windows bianries in forked repo

ec2-bot · ec2-bot · commit 8b63320b7e2c · 2024-05-14T14:25:59.000-07:00
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -16,7 +16,7 @@ env:
   DEFAULT_GO_VERSION: ^1.21.5
   GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
   GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
-  WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
+  LIKITHA_WEBHOOK_URL: ${{ secrets.LIKITHA_WEBHOOK_URL }}
 
 jobs:
   fastTests:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -10,9 +10,9 @@ permissions:
 
 env:
   DEFAULT_GO_VERSION: ^1.21.5
-  GITHUB_USERNAME: ${{ secrets.EC2_BOT_GITHUB_USERNAME }}
-  GITHUB_TOKEN: ${{ secrets.EC2_BOT_GITHUB_TOKEN }}
-  WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
+  GITHUB_USERNAME: ${{ secrets.LIKITHA_GITHUB_USERNAME }}
+  GITHUB_TOKEN: ${{ secrets.LIKITHA_GITHUB_TOKEN }}
+  LIKITHA_WEBHOOK_URL: ${{ secrets.LIKITHA_WEBHOOK_URL }}
 
 jobs:
   releaseLinux:
@@ -52,42 +52,42 @@ jobs:
         Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
         refreshenv
 
-        choco install make && choco install zip && make release-windows
+        choco install make && choco install zip && choco install wsl && make release-windows
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
 
-  release:
-    name: Release
-    runs-on: ubuntu-20.04
-    needs: [releaseLinux, releaseWindows]
-    steps:
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ env.DEFAULT_GO_VERSION }}
+  # release:
+  #   name: Release
+  #   runs-on: ubuntu-20.04
+  #   needs: [releaseLinux, releaseWindows]
+  #   steps:
+  #   - name: Set up Go 1.x
+  #     uses: actions/setup-go@v2
+  #     with:
+  #       go-version: ${{ env.DEFAULT_GO_VERSION }}
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+  #   - name: Check out code into the Go module directory
+  #     uses: actions/checkout@v2
     
-    - name: Sync Helm Chart Catalog information
-      run: make sync-catalog-information-for-helm-chart
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
+    # - name: Sync Helm Chart Catalog information
+    #   run: make sync-catalog-information-for-helm-chart
+    #   env:
+    #     AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+    #     AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    #     AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
     
-    - name: Sync Helm Chart to ECR Public
-      run: make push-helm-chart
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
+    # - name: Sync Helm Chart to ECR Public
+    #   run: make push-helm-chart
+    #   env:
+    #     AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+    #     AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    #     AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
     
-    - name: Sync Readme to ECR Public
-      run: make sync-readme-to-ecr-public
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
+    # - name: Sync Readme to ECR Public
+    #   run: make sync-readme-to-ecr-public
+    #   env:
+    #     AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+    #     AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+    #     AWS_SESSION_TOKEN: ${{ secrets.AWS_SESSION_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -3,8 +3,8 @@ LATEST_RELEASE_TAG=$(shell git describe --tags --abbrev=0)
 LATEST_COMMIT_HASH=$(shell git rev-parse HEAD)
 LATEST_COMMIT_CHART_VERSION=$(shell git --no-pager show ${LATEST_COMMIT_HASH}:config/helm/aws-node-termination-handler/Chart.yaml | grep 'version:' | cut -d' ' -f2 | tr -d '[:space:]')
 PREVIOUS_RELEASE_TAG=$(shell git describe --abbrev=0 --tags `git rev-list --tags --skip=1  --max-count=1`)
-REPO_FULL_NAME=aws/aws-node-termination-handler
-ECR_REGISTRY ?= public.ecr.aws/aws-ec2
+REPO_FULL_NAME=LikithaVemulapalli/aws-node-termination-handler
+ECR_REGISTRY ?= public.ecr.aws/k8y8j2b2
 ECR_REPO ?= ${ECR_REGISTRY}/aws-node-termination-handler
 ECR_REPO_CHART ?= aws-node-termination-handler
 IMG ?= amazon/aws-node-termination-handler
diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml
@@ -116,7 +116,7 @@ spec:
               value: {{ . | quote }}
             {{- end }}
             {{- if or .Values.webhookURL .Values.webhookURLSecretName }}
-            - name: WEBHOOK_URL
+            - name: LIKITHA_WEBHOOK_URL
             {{- if .Values.webhookURLSecretName }}
               valueFrom:
                 secretKeyRef:
diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml
@@ -116,7 +116,7 @@ spec:
               value: {{ . | quote }}
             {{- end }}
             {{- if or .Values.webhookURL .Values.webhookURLSecretName }}
-            - name: WEBHOOK_URL
+            - name: LIKITHA_WEBHOOK_URL
             {{- if .Values.webhookURLSecretName }}
               valueFrom:
                 secretKeyRef:
diff --git a/config/helm/aws-node-termination-handler/templates/deployment.yaml b/config/helm/aws-node-termination-handler/templates/deployment.yaml
@@ -121,7 +121,7 @@ spec:
               value: {{ . | quote }}
             {{- end }}
             {{- if or .Values.webhookURL .Values.webhookURLSecretName }}
-            - name: WEBHOOK_URL
+            - name: LIKITHA_WEBHOOK_URL
             {{- if .Values.webhookURLSecretName }}
               valueFrom:
                 secretKeyRef:
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -40,7 +40,7 @@ const (
 	podTerminationGracePeriodDefault        = -1
 	nodeTerminationGracePeriodConfigKey     = "NODE_TERMINATION_GRACE_PERIOD"
 	nodeTerminationGracePeriodDefault       = 120
-	webhookURLConfigKey                     = "WEBHOOK_URL"
+	webhookURLConfigKey                     = "LIKITHA_WEBHOOK_URL"
 	webhookURLDefault                       = ""
 	webhookProxyConfigKey                   = "WEBHOOK_PROXY"
 	webhookProxyDefault                     = ""
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -47,7 +47,7 @@ func TestParseCliArgsEnvSuccess(t *testing.T) {
 	t.Setenv("NODE_TERMINATION_GRACE_PERIOD", "12345")
 	t.Setenv("INSTANCE_METADATA_URL", "INSTANCE_METADATA_URL")
 	t.Setenv("POD_TERMINATION_GRACE_PERIOD", "12345")
-	t.Setenv("WEBHOOK_URL", "WEBHOOK_URL")
+	t.Setenv("LIKITHA_WEBHOOK_URL", "LIKITHA_WEBHOOK_URL")
 	t.Setenv("WEBHOOK_HEADERS", "WEBHOOK_HEADERS")
 	t.Setenv("WEBHOOK_TEMPLATE", "WEBHOOK_TEMPLATE")
 	t.Setenv("METADATA_TRIES", "100")
@@ -71,7 +71,7 @@ func TestParseCliArgsEnvSuccess(t *testing.T) {
 	h.Equals(t, 12345, nthConfig.NodeTerminationGracePeriod)
 	h.Equals(t, "INSTANCE_METADATA_URL", nthConfig.MetadataURL)
 	h.Equals(t, 12345, nthConfig.PodTerminationGracePeriod)
-	h.Equals(t, "WEBHOOK_URL", nthConfig.WebhookURL)
+	h.Equals(t, "LIKITHA_WEBHOOK_URL", nthConfig.WebhookURL)
 	h.Equals(t, "WEBHOOK_HEADERS", nthConfig.WebhookHeaders)
 	h.Equals(t, "WEBHOOK_TEMPLATE", nthConfig.WebhookTemplate)
 	h.Equals(t, 100, nthConfig.MetadataTries)
@@ -106,7 +106,7 @@ func TestParseCliArgsSuccess(t *testing.T) {
 		"--node-termination-grace-period=12345",
 		"--metadata-url=INSTANCE_METADATA_URL",
 		"--pod-termination-grace-period=12345",
-		"--webhook-url=WEBHOOK_URL",
+		"--webhook-url=LIKITHA_WEBHOOK_URL",
 		"--webhook-headers=WEBHOOK_HEADERS",
 		"--webhook-template=WEBHOOK_TEMPLATE",
 		"--metadata-tries=100",
@@ -131,7 +131,7 @@ func TestParseCliArgsSuccess(t *testing.T) {
 	h.Equals(t, 12345, nthConfig.NodeTerminationGracePeriod)
 	h.Equals(t, "INSTANCE_METADATA_URL", nthConfig.MetadataURL)
 	h.Equals(t, 12345, nthConfig.PodTerminationGracePeriod)
-	h.Equals(t, "WEBHOOK_URL", nthConfig.WebhookURL)
+	h.Equals(t, "LIKITHA_WEBHOOK_URL", nthConfig.WebhookURL)
 	h.Equals(t, "WEBHOOK_HEADERS", nthConfig.WebhookHeaders)
 	h.Equals(t, "WEBHOOK_TEMPLATE", nthConfig.WebhookTemplate)
 	h.Equals(t, 100, nthConfig.MetadataTries)
@@ -162,7 +162,7 @@ func TestParseCliArgsOverrides(t *testing.T) {
 	t.Setenv("NODE_TERMINATION_GRACE_PERIOD", "99999")
 	t.Setenv("INSTANCE_METADATA_URL", "no")
 	t.Setenv("POD_TERMINATION_GRACE_PERIOD", "99999")
-	t.Setenv("WEBHOOK_URL", "no")
+	t.Setenv("LIKITHA_WEBHOOK_URL", "no")
 	t.Setenv("WEBHOOK_HEADERS", "no")
 	t.Setenv("WEBHOOK_TEMPLATE", "no")
 	t.Setenv("METADATA_TRIES", "100")
@@ -184,7 +184,7 @@ func TestParseCliArgsOverrides(t *testing.T) {
 		"--node-termination-grace-period=12345",
 		"--metadata-url=INSTANCE_METADATA_URL",
 		"--pod-termination-grace-period=12345",
-		"--webhook-url=WEBHOOK_URL",
+		"--webhook-url=LIKITHA_WEBHOOK_URL",
 		"--webhook-headers=WEBHOOK_HEADERS",
 		"--webhook-template=WEBHOOK_TEMPLATE",
 		"--metadata-tries=101",
@@ -211,7 +211,7 @@ func TestParseCliArgsOverrides(t *testing.T) {
 	h.Equals(t, 12345, nthConfig.NodeTerminationGracePeriod)
 	h.Equals(t, "INSTANCE_METADATA_URL", nthConfig.MetadataURL)
 	h.Equals(t, 12345, nthConfig.PodTerminationGracePeriod)
-	h.Equals(t, "WEBHOOK_URL", nthConfig.WebhookURL)
+	h.Equals(t, "LIKITHA_WEBHOOK_URL", nthConfig.WebhookURL)
 	h.Equals(t, "WEBHOOK_HEADERS", nthConfig.WebhookHeaders)
 	h.Equals(t, "WEBHOOK_TEMPLATE", nthConfig.WebhookTemplate)
 	h.Equals(t, 101, nthConfig.MetadataTries)
diff --git a/test/e2e/webhook-http-proxy-test b/test/e2e/webhook-http-proxy-test
@@ -125,7 +125,7 @@ anth_helm_args=(
   --set image.tag="$NODE_TERMINATION_HANDLER_DOCKER_TAG"
   --set enableSpotInterruptionDraining="true"
   --set enableScheduledEventDraining="true"
-  --set webhookURL="$WEBHOOK_URL"
+  --set webhookURL="$LIKITHA_WEBHOOK_URL"
   --set webhookTemplate="\{\"Content\":\"[NTH][Instance Interruption] InstanceId: \{\{ \.InstanceID \}\} - Node: \{\{ \.NodeName \}\} - InstanceType: \{\{ \.InstanceType \}\} - Kind: \{\{ \.Kind \}\} - Start Time: \{\{ \.StartTime \}\}\"\}"
   --set webhookProxy="$SQUID_URL"
   --force
@@ -179,7 +179,7 @@ for i in $(seq 1 $TAINT_CHECK_CYCLES); do
     sent=1
   fi
 
-  webhook_hostname=$(echo "${WEBHOOK_URL}" | sed -e 's@^[^/]*//@@' -e 's@/.*$@@')
+  webhook_hostname=$(echo "${LIKITHA_WEBHOOK_URL}" | sed -e 's@^[^/]*//@@' -e 's@/.*$@@')
   if [[ $sent -eq 1 ]] && kubectl exec -i "$(echo "${squid_worker_pods}" | cut -d' ' -f1)" -- cat /var/log/squid/access.log | grep "${webhook_hostname}" >/dev/null; then
      echo "✅ Verified the webhook POST used the http proxy"
         exit 0
diff --git a/test/e2e/webhook-secret-test b/test/e2e/webhook-secret-test
@@ -14,7 +14,7 @@ echo "Starting Webhook URL Secret Test for Node Termination Handler"
 
 SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
 
-WEBHOOKURL_LITERAL="webhookurl=${WEBHOOK_URL}"
+WEBHOOKURL_LITERAL="webhookurl=${LIKITHA_WEBHOOK_URL}"
 WEBHOOK_NAME="webhooksecret"
 
 function cleanup {
diff --git a/test/e2e/webhook-test b/test/e2e/webhook-test
@@ -34,7 +34,7 @@ anth_helm_args=(
   --set instanceMetadataURL="${INSTANCE_METADATA_URL:-"http://$AEMM_URL:$IMDS_PORT"}"
   --set image.repository="$NODE_TERMINATION_HANDLER_DOCKER_REPO"
   --set image.tag="$NODE_TERMINATION_HANDLER_DOCKER_TAG"
-  --set webhookURL="${WEBHOOK_URL}"
+  --set webhookURL="${LIKITHA_WEBHOOK_URL}"
   --set webhookTemplate="\{\"Content\":\"[NTH][Instance Interruption] InstanceId: \{\{ \.InstanceID \}\} - Node: \{\{ \.NodeName \}\} - InstanceType: \{\{ \.InstanceType \}\} -  AvailabilityZone: \{\{ \.AvailabilityZone \}\} - Kind: \{\{ \.Kind \}\} - Start Time: \{\{ \.StartTime \}\}\"\}"
   --set enableSpotInterruptionDraining="true"
   --set enableScheduledEventDraining="true"
diff --git a/test/eks-cluster-test/run-test b/test/eks-cluster-test/run-test
@@ -31,7 +31,7 @@ USAGE=$(cat << 'EOM'
                  WEBHOOK_DOCKER_PULL_POLICY                   Webhook Proxy Docker image pull policy (defaults to DOCKER_PULL_POLICY)
                  EC2_METADATA_PORT                            EC2 Metadata Test Proxy port (defaults to 18999)
                  EC2_METADATA_URL                             EC2 Metadata Test Proxy URL (defaults to "http://amazon-ec2-metadata-mock-service.default.svc.cluster.local:$EC2_METADATA_PORT")
-                 WEBHOOK_URL                                  Webhook URL (defaults to "http://webhook-test-proxy.default.svc.cluster.local")
+                 LIKITHA_WEBHOOK_URL                                  Webhook URL (defaults to "http://webhook-test-proxy.default.svc.cluster.local")
 EOM
 )
 
@@ -143,7 +143,7 @@ echo "WEBHOOK_DOCKER_TAG=${WEBHOOK_DOCKER_TAG:?"not found"}"
 echo "WEBHOOK_DOCKER_PULL_POLICY=${WEBHOOK_DOCKER_PULL_POLICY:=$DOCKER_PULL_POLICY}"
 echo "EC2_METADATA_PORT=${EC2_METADATA_PORT:=18999}"
 echo "EC2_METADATA_URL=${EC2_METADATA_URL:="http://amazon-ec2-metadata-mock-service.default.svc.cluster.local:$EC2_METADATA_PORT"}"
-echo "WEBHOOK_URL=${WEBHOOK_URL:="http://webhook-test-proxy.default.svc.cluster.local"}"
+echo "LIKITHA_WEBHOOK_URL=${LIKITHA_WEBHOOK_URL:="http://webhook-test-proxy.default.svc.cluster.local"}"
 
 # The e2e test scripts use other variable names.
 echo "IMDS_PORT=${IMDS_PORT:=$EC2_METADATA_PORT}"
@@ -158,7 +158,7 @@ fi
 
 export NODE_TERMINATION_HANDLER_DOCKER_PULL_POLICY \
     WEBHOOK_DOCKER_PULL_POLICY \
-    WEBHOOK_URL \
+    LIKITHA_WEBHOOK_URL \
     IMDS_PORT \
     INSTANCE_METADATA_URL
 
diff --git a/test/k8s-local-cluster-test/run-test b/test/k8s-local-cluster-test/run-test
@@ -20,7 +20,7 @@ K8S_VERSION="1.29"
 AEMM_URL="amazon-ec2-metadata-mock-service.default.svc.cluster.local"
 AEMM_VERSION="1.8.1"
 AEMM_DL_URL="https://github.com/aws/amazon-ec2-metadata-mock/releases/download/v$AEMM_VERSION/amazon-ec2-metadata-mock-$AEMM_VERSION.tgz"
-WEBHOOK_URL=${WEBHOOK_URL:="http://webhook-test-proxy.default.svc.cluster.local"}
+LIKITHA_WEBHOOK_URL=${LIKITHA_WEBHOOK_URL:="http://webhook-test-proxy.default.svc.cluster.local"}
 
 ASSERTION_SCRIPTS=$(find "$SCRIPTPATH/../e2e" -type f | sort)
 SCRIPT_DENYLIST=(
@@ -253,7 +253,7 @@ export CLUSTER_NAME
 export AEMM_URL
 export AEMM_VERSION
 export AEMM_DL_URL
-export WEBHOOK_URL
+export LIKITHA_WEBHOOK_URL
 export -f timeout
 export -f relpath
 export -f get_nth_worker_pod
