Renamed Docker Hub Credentials

.github/workflows/ci-2021-0-x.yml

@@ -11,8 +11,8 @@ jobs:
   build:
     uses: ./.github/workflows/common.yml
     secrets:
-      DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-      DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }}
       GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }}
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}

.github/workflows/ci-2021-1-x.yml

@@ -11,8 +11,8 @@ jobs:
   build:
     uses: ./.github/workflows/common.yml
     secrets:
-      DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-      DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }}
       GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }}
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}

.github/workflows/ci-main.yml

@@ -12,8 +12,8 @@ jobs:
   build:
     uses: ./.github/workflows/common.yml
     secrets:
-      DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-      DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }}
       GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }}
       ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}

.github/workflows/common.yml

@@ -19,8 +19,8 @@ on:
         default: false
         description: 'Enable Maven Threads'
     secrets:
-      DOCKER_HUB_USERNAME:
-      DOCKER_HUB_PASSWORD:
+      DOCKERHUB_USERNAME:
+      DOCKERHUB_TOKEN:
       TMC_API_TOKEN:
       GCP_CRED_JSON:
       ARTIFACTORY_USERNAME:
@@ -294,10 +294,10 @@ jobs:
       - name: 'Configure: Install Pack'
         uses: ./.github/actions/install-pack
       - name: 'Configure: Docker login'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: 'Build: ${{ matrix.app }}'
         shell: bash
         timeout-minutes: 30
@@ -319,8 +319,8 @@ jobs:
       - name: 'Publish: ${{ matrix.app }}'
         shell: bash
         env:
-          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
           MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: ./publish-app.sh "stream-applications" "applications/processor/${{ matrix.app }}"
@@ -375,10 +375,11 @@ jobs:
       - name: 'Configure: Install Pack'
         uses: ./.github/actions/install-pack
       - name: 'Configure: Docker login'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: 'Build: ${{ matrix.app }}'
         shell: bash
         timeout-minutes: 30
@@ -399,8 +400,8 @@ jobs:
       - name: 'Publish: ${{ matrix.app }}'
         shell: bash
         env:
-          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
         run: ./publish-app.sh "stream-applications" "applications/sink/${{ matrix.app }}"
   sources:
@@ -456,10 +457,10 @@ jobs:
       - name: 'Configure: Install Pack'
         uses: ./.github/actions/install-pack
       - name: 'Configure: Docker login'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: 'Build: ${{ matrix.app }}'
         shell: bash
         timeout-minutes: 30
@@ -480,8 +481,8 @@ jobs:
       - name: 'Publish: ${{ matrix.app }}'
         shell: bash
         env:
-          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           DEFAULT_JDK: ${{ needs.parameters.outputs.jre_version }}
           MAVEN_THREADS: ${{ inputs.useMavenThreads }}
         run: ./publish-app.sh "stream-applications" "applications/source/${{ matrix.app }}"

.github/workflows/housekeeping.yml

@@ -307,8 +307,8 @@ jobs:
     secrets:
       TMC_API_TOKEN: ${{ secrets.TMC_API_TOKEN }}
       GCP_CRED_JSON: ${{ secrets.GCP_CRED_JSON }}
-      DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-      DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       GH_ARC_APP_ID: ${{ secrets.GH_ARC_APP_ID }}
       GH_ARC_INSTALLATION_ID: ${{ secrets.GH_ARC_INSTALLATION_ID }}
       GH_ARC_PRIVATE_KEY: ${{ secrets.GH_ARC_PRIVATE_KEY }}

.github/workflows/recreate-runners.yml

@@ -16,9 +16,9 @@ on:
         required: true
       GCP_CRED_JSON:
         required: true
-      DOCKER_HUB_USERNAME:
+      DOCKERHUB_USERNAME:
         required: true
-      DOCKER_HUB_PASSWORD:
+      DOCKERHUB_TOKEN:
         required: true
       GH_ARC_APP_ID:
         required: false
@@ -130,8 +130,8 @@ jobs:
         timeout-minutes: 30
         env:
           VERBOSE: ${{ inputs.verbose == 'true' && '--verbose' || '' }}
-          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
-          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
           GH_ARC_APP_ID: ${{ secrets.GH_ARC_APP_ID }}
           GH_ARC_INSTALLATION_ID: ${{ secrets.GH_ARC_INSTALLATION_ID }}
           GH_ARC_PRIVATE_KEY: ${{ secrets.GH_ARC_PRIVATE_KEY }}

scripts/deploy-gh-runners.sh

@@ -72,14 +72,14 @@ echo "Create secret scdf-metadata-default in $NS"
 $SCDIR/delete-secret.sh scdf-metadata-default $NS
 kubectl create secret docker-registry scdf-metadata-default --namespace $NS \
   --docker-server=registry-1.docker.io \
-  --docker-username=$DOCKER_HUB_USERNAME \
-  --docker-password=$DOCKER_HUB_PASSWORD
+  --docker-username=$DOCKERHUB_USERNAME \
+  --docker-password=$DOCKERHUB_TOKEN
 echo "Create secret scdf-metadata-default in default"
 $SCDIR/delete-secret.sh scdf-metadata-default default
 kubectl create secret docker-registry scdf-metadata-default --namespace default \
   --docker-server=registry-1.docker.io \
-  --docker-username=$DOCKER_HUB_USERNAME \
-  --docker-password=$DOCKER_HUB_PASSWORD
+  --docker-username=$DOCKERHUB_USERNAME \
+  --docker-password=$DOCKERHUB_TOKEN
 
 if [ "$DEPLOY_TYPE" == "helm" ]; then
   HELM_VER=$($SCDIR/determine-default.sh stream-apps-gh-runners "helm_version")