Merge pull request #453 from wallarm/NODE-5655

NODE-5655 add docker auth to tests
wallarm · Sep 18, 2024 · f2d88f6 · f2d88f6
2 parents 097944d + 98ade80
commit f2d88f6
Show file tree

Hide file tree

Showing 23 changed files with 5,648 additions and 38 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,6 +49,8 @@ jobs:
             smoke:
               - 'test/smoke/*'
 
+
+
   build:
     name: Build images
     runs-on: ${{ matrix.RUNNER }}
@@ -83,13 +85,18 @@ jobs:
             kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
             kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
 
+      - name: Login to DockerHub
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
+
       - name: Build controller images
         env:
           REGISTRY: wallarm
           TAG: 1.0.0-dev
           USER: runner
         run: |
-          echo ${DOCKERHUB_PASSWORD} | docker login -u ${DOCKERHUB_USER} --password-stdin
           echo "Building controller images ..."
           make clean-image build image image-chroot
           echo "Building E2E image ..."
@@ -106,6 +113,8 @@ jobs:
           name: controller-${{ env.ARCH }}.tar
           path: controller-${{ env.ARCH }}.tar
 
+
+
   smoke:
     name: Smoke
     runs-on: ${{ matrix.RUNNER }}
@@ -149,8 +158,8 @@ jobs:
             kv-gitlab-ci/data/github/shared/allure allure_token ;
             kv-gitlab-ci/data/github/shared/smoke-tests-registry-creds token_name ;
             kv-gitlab-ci/data/github/shared/smoke-tests-registry-creds token_secret ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds user ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds password ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
 
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -164,7 +173,10 @@ jobs:
         run: docker load -i controller-${{ env.ARCH }}.tar
 
       - name: Login to DockerHub
-        run: echo ${{ steps.secrets.outputs.password }} | docker login -u ${{ steps.secrets.outputs.user }} --password-stdin
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Create cluster
         run: kind create cluster --image=kindest/node:${{ matrix.k8s }}
@@ -192,6 +204,8 @@ jobs:
         run: |
           make kind-smoke-test
 
+
+
   chart-testing:
     name: Chart testing
     runs-on: self-hosted-amd64-2cpu
@@ -217,8 +231,8 @@ jobs:
           path: kubernetes-ci
           secrets: |
             kv-gitlab-ci/data/github/ingress api_token ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds user ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds password ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
 
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -234,7 +248,10 @@ jobs:
         run: docker load -i controller-${{ env.ARCH }}.tar
 
       - name: Login to DockerHub
-        run: echo ${{ steps.secrets.outputs.password }} | docker login -u ${{ steps.secrets.outputs.user }} --password-stdin
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Create cluster
         run: kind create cluster --image=kindest/node:v1.25.8 --config test/e2e/kind.yaml
@@ -246,11 +263,15 @@ jobs:
           SKIP_IMAGE_CREATION: true
           WALLARM_API_TOKEN: ${{ steps.secrets.outputs.api_token }}
           CT_MODE: ${{ matrix.method }}
+          DOCKERHUB_USER: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
         run: |
           kind get kubeconfig > $GITHUB_WORKSPACE/kind-config-kind
           export KUBECONFIG=$GITHUB_WORKSPACE/kind-config-kind
           make kind-e2e-chart-tests
 
+
+
   e2e:
     name: E2E
     runs-on: self-hosted-amd64-4cpu
@@ -282,11 +303,14 @@ jobs:
           method: kubernetes
           path: kubernetes-ci
           secrets: |
-            kv-gitlab-ci/data/github/shared/dockerhub-creds user ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds password ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
 
       - name: Login to DockerHub
-        run: echo ${{ steps.secrets.outputs.password }} | docker login -u ${{ steps.secrets.outputs.user }} --password-stdin
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Create cluster
         run: kind create cluster --image=kindest/node:v1.25.8 --config test/e2e/kind.yaml
@@ -298,11 +322,14 @@ jobs:
           SKIP_INGRESS_IMAGE_CREATION: true
           SKIP_E2E_IMAGE_CREATION: true
           ARCH: amd64
+          DOCKERHUB_USER: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
         run: |
           kind get kubeconfig > $HOME/.kube/kind-config-kind
           make kind-e2e-test
 
 
+
   e2e-wallarm:
     name: E2E - Wallarm
     runs-on: self-hosted-amd64-4cpu
@@ -330,8 +357,8 @@ jobs:
           secrets: |
             kv-gitlab-ci/data/github/ingress api_token ;
             kv-gitlab-ci/data/github/ingress api_host ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds user ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds password ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
 
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -345,7 +372,10 @@ jobs:
         run: docker load -i controller-${{ env.ARCH }}.tar
 
       - name: Login to DockerHub
-        run: echo ${{ steps.secrets.outputs.password }} | docker login -u ${{ steps.secrets.outputs.user }} --password-stdin
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Create cluster ${{ matrix.k8s }}
         run: kind create cluster --image=kindest/node:${{ matrix.k8s }} --config test/e2e/kind.yaml
@@ -359,10 +389,14 @@ jobs:
           WALLARM_ENABLED: true
           WALLARM_API_TOKEN: ${{ steps.secrets.outputs.api_token }}
           WALLARM_API_HOST: ${{ steps.secrets.outputs.api_host }}
+          DOCKERHUB_USER: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          DOCKERHUB_PASSWORD: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
         run: |
           kind get kubeconfig > $HOME/.kube/kind-config-kind
           make E2E_NODES=7 kind-e2e-test
 
+
+
   scan:
     name: Scan images
     runs-on: self-hosted-amd64-1cpu
@@ -393,11 +427,14 @@ jobs:
           method: kubernetes
           path: kubernetes-ci
           secrets: |
-            kv-gitlab-ci/data/github/shared/dockerhub-creds user ;
-            kv-gitlab-ci/data/github/shared/dockerhub-creds password ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
+            kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
 
       - name: Login to DockerHub
-        run: echo ${{ steps.secrets.outputs.password }} | docker login -u ${{ steps.secrets.outputs.user }} --password-stdin
+        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446
+        with:
+          username: ${{ steps.secrets.outputs.DOCKERHUB_USER }}
+          password: ${{ steps.secrets.outputs.DOCKERHUB_PASSWORD }}
 
       - name: Scan controller image
         uses: anchore/scan-action@3343887d815d7b07465f6fdcd395bd66508d486a

diff --git a/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml b/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml
@@ -12,4 +12,4 @@ controller:
   config:
     use-proxy-protocol: "true"
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml b/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml
@@ -13,4 +13,4 @@ controller:
       annotations:
         service.beta.kubernetes.io/aws-load-balancer-internal: "true"
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deamonset-default-values.yaml b/charts/ingress-nginx/ci/deamonset-default-values.yaml
@@ -9,4 +9,4 @@ controller:
   service:
     type: ClusterIP
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deamonset-fallback-off-values.yaml b/charts/ingress-nginx/ci/deamonset-fallback-off-values.yaml
@@ -10,4 +10,4 @@ controller:
     type: ClusterIP
   wallarm:
     apiHost: api.wallarm.com
-    fallback: "off"
+    fallback: "off"
diff --git a/charts/ingress-nginx/ci/deamonset-fallback-values.yaml b/charts/ingress-nginx/ci/deamonset-fallback-values.yaml
@@ -10,4 +10,4 @@ controller:
     type: ClusterIP
   wallarm:
     # Intentionally put wrong URL to check
-    apiHost: wrong_url.api.wallarm.com
+    apiHost: wrong_url.api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deamonset-metrics-values.yaml b/charts/ingress-nginx/ci/deamonset-metrics-values.yaml
@@ -13,4 +13,4 @@ controller:
   wallarm:
     apiHost: api.wallarm.com
     metrics:
-      enabled: true
+      enabled: true
diff --git a/charts/ingress-nginx/ci/deamonset-webhook-values.yaml b/charts/ingress-nginx/ci/deamonset-webhook-values.yaml
@@ -9,4 +9,4 @@ controller:
   service:
     type: ClusterIP
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-customconfig-values.yaml b/charts/ingress-nginx/ci/deployment-customconfig-values.yaml
@@ -11,4 +11,4 @@ controller:
   service:
     type: ClusterIP
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-fallback-off-values.yaml b/charts/ingress-nginx/ci/deployment-fallback-off-values.yaml
@@ -10,4 +10,4 @@ controller:
     type: ClusterIP
   wallarm:
     apiHost: api.wallarm.com
-    fallback: "off"
+    fallback: "off"
diff --git a/charts/ingress-nginx/ci/deployment-fallback-values.yaml b/charts/ingress-nginx/ci/deployment-fallback-values.yaml
@@ -9,4 +9,4 @@ controller:
     type: ClusterIP
   wallarm:
     # Intentionally put wrong URL to check
-    apiHost: wrong_url.api.wallarm.com
+    apiHost: wrong_url.api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-headers-values.yaml b/charts/ingress-nginx/ci/deployment-headers-values.yaml
@@ -12,4 +12,4 @@ controller:
   service:
     type: ClusterIP
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-metrics-values.yaml b/charts/ingress-nginx/ci/deployment-metrics-values.yaml
@@ -12,4 +12,4 @@ controller:
   wallarm:
     apiHost: api.wallarm.com
     metrics:
-      enabled: true
+      enabled: true
diff --git a/charts/ingress-nginx/ci/deployment-nodeport-values.yaml b/charts/ingress-nginx/ci/deployment-nodeport-values.yaml
@@ -8,4 +8,4 @@ controller:
   service:
     type: NodePort
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-podannotations-values.yaml b/charts/ingress-nginx/ci/deployment-podannotations-values.yaml
@@ -15,4 +15,4 @@ controller:
     prometheus.io/scheme: http
     prometheus.io/scrape: "true"
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml b/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml
@@ -11,4 +11,4 @@ controller:
     patch:
       enabled: true
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml b/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml
@@ -22,4 +22,4 @@ controller:
     patch:
       enabled: true
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com
diff --git a/charts/ingress-nginx/ci/deployment-webhook-values.yaml b/charts/ingress-nginx/ci/deployment-webhook-values.yaml
@@ -8,4 +8,4 @@ controller:
   service:
     type: ClusterIP
   wallarm:
-    apiHost: api.wallarm.com
+    apiHost: api.wallarm.com