stakater · rasheedamir · Oct 11, 2024 · Oct 11, 2024
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -8,12 +8,13 @@ on:
 env:
   DOCKER_FILE_PATH: Dockerfile
   GOLANG_VERSION: 1.17.7
+  CONTAINER_REGISTRY_URL: ghcr.io/stakater
 
 jobs:
   build:
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest
     name: Build
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"    
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
     steps:
     - name: Check out code
       uses: actions/checkout@v4
@@ -38,7 +39,7 @@ jobs:
         sha=${{ github.event.pull_request.head.sha }}
         tag="SNAPSHOT-PR-${{ github.event.pull_request.number }}-${sha:0:8}"
         echo "##[set-output name=GIT_TAG;]$(echo ${tag})"
-    
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
@@ -47,10 +48,9 @@ jobs:
 
     - name: Generate image repository path
       run: |
-        echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+        echo IMAGE_REPOSITORY=$(echo ${{ env.CONTAINER_REGISTRY_URL }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
     # To identify any broken changes in dockerfiles or dependencies
-
     - name: Build image
       uses: docker/build-push-action@v6
       with:
@@ -63,32 +63,4 @@ jobs:
           ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}
         labels: |
           org.opencontainers.image.source=${{ github.event.repository.clone_url }}
-          org.opencontainers.image.created=${{ steps.prep.outputs.created }}
           org.opencontainers.image.revision=${{ github.sha }}
-
-    # - name: Comment on PR
-    #   uses: mshick/add-pr-comment@v2
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-    #   with:
-    #     message: '@${{ github.actor }} Image is available for testing. `docker pull ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}`'
-    #     allow-repeats: false
-
-    # - name: Notify Failure
-    #   if: failure()
-    #   uses: mshick/add-pr-comment@v2
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-    #   with:
-    #     message: '@${{ github.actor }} Yikes! You better fix it before anyone else finds out! [Build](https://github.com/${{ github.repository }}/commit/${{ github.event.pull_request.head.sha }}/checks) has Failed!'
-    #     allow-repeats: false
-
-    # - name: Notify Slack
-    #   uses: 8398a7/action-slack@v3
-    #   if: always() # Pick up events even if the job fails or is canceled.
-    #   with:
-    #     status: ${{ job.status }}
-    #     fields: repo,author,action,eventName,ref,workflow
-    #   env:
-    #     GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-    #     SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -10,18 +10,18 @@ env:
   GOLANG_VERSION: 1.17.7
   OPERATOR_SDK_VERSION: "1.2.0"
   KUSTOMIZE_VERSION: "3.5.4"
+  CONTAINER_REGISTRY_URL: ghcr.io/stakater
 
 jobs:
   build:
     name: Build
     if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Check out code
       uses: actions/checkout@v4
       with:
-        persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
         fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
 
     - name: Set up Go
@@ -39,12 +39,12 @@ jobs:
       id: generate_tag
       uses: anothrNick/github-tag-action@1.71.0
       env:
-        GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         WITH_V: true
         DEFAULT_BUMP: patch
         RELEASE_BRANCHES: master
         DRY_RUN: true
-    
+
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
 
@@ -54,12 +54,13 @@ jobs:
     - name: Login to Registry
       uses: docker/login-action@v3
       with:
-        username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }}
-        password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }}
+        registry: ${{ env.CONTAINER_REGISTRY_URL }}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GHCR_TOKEN }}
 
     - name: Generate image repository path
       run: |
-        echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+        echo IMAGE_REPOSITORY=$(echo ${{ env.CONTAINER_REGISTRY_URL }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
     - name: Build and push
       uses: docker/build-push-action@v6
@@ -68,21 +69,20 @@ jobs:
         file: ${{ env.DOCKER_FILE_PATH  }}
         pull: true
         push: true
-        build-args: GIT_ACCESS_TOKEN=${{ secrets.STAKATER_GITHUB_TOKEN }}
+        build-args: GIT_ACCESS_TOKEN=${{ secrets.PUBLISH_TOKEN }}
         cache-to: type=inline
         tags: |
           ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}
         labels: |
           org.opencontainers.image.source=${{ github.event.repository.clone_url }}
-          org.opencontainers.image.created=${{ steps.prep.outputs.created }}
           org.opencontainers.image.revision=${{ github.sha }}
 
     # Generate tag for operator without "v"
     - name: Generate Operator Tag
       id: generate_operator_tag
       uses: anothrNick/github-tag-action@1.71.0
       env:
-        GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         WITH_V: false
         DEFAULT_BUMP: patch
         RELEASE_BRANCHES: master
@@ -93,30 +93,23 @@ jobs:
       env:
         VERSION: ${{ steps.generate_operator_tag.outputs.new_tag }}
       run: make bump-chart
-    
+
     - name: Update Chart CRDs
       run: make manifests
-      
+
     # Setting up helm binary
     - uses: azure/setup-helm@v4
 
-    # # Publish helm chart to nexus
-    # - name: Publish Helm chart
-    #   run: |
-    #     helm package ./charts/konfigurator --destination ./packaged-chart
-    #     curl -u ${{ secrets.STAKATER_NEXUS_PROD_HELM_USERNAME }}:${{ secrets.STAKATER_NEXUS_PROD_HELM_PASSWORD }} ${{ secrets.STAKATER_NEXUS_PROD_HELM_REGISTRY }} --upload-file ./packaged-chart/*.tgz
-    #     rm -rf ./packaged-chart
-
     # Publish helm chart
     - name: Publish Helm chart
       uses: stefanprodan/helm-gh-pages@master
       with:
         branch: master
         repository: stakater-charts
         target_dir: docs
-        token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        token: ${{ secrets.PUBLISH_TOKEN }}
         charts_dir: charts
-        charts_url: https://stakater.github.io/stakater-charts
+        charts_url: ${{ secrets.HELM_REGISTRY_URL }}
         owner: stakater
         linting: off
         commit_username: stakater-user
@@ -127,18 +120,20 @@ jobs:
       run: |
         git config --local user.email "github-root@stakater.com"
         git config --local user.name "stakater-github-root"
-        git status 
+        git status
         git add .
         git commit -m "[skip-ci] Update artifacts" -a
+
     - name: Push changes
       uses: ad-m/github-push-action@master
       with:
-        github_token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        github_token: ${{ secrets.PUBLISH_TOKEN }}
         branch: master
+
     - name: Push Latest Tag
       uses: anothrNick/github-tag-action@1.71.0
       env:
-        GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
         WITH_V: true
         RELEASE_BRANCHES: master
         DEFAULT_BUMP: patch
@@ -150,5 +145,4 @@ jobs:
         status: ${{ job.status }}
         fields: repo,author,action,eventName,ref,workflow
       env:
-        GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
         SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
           version: latest
           args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
 
       - name: Notify Slack
         uses: 8398a7/action-slack@v3
@@ -40,5 +40,4 @@ jobs:
           status: ${{ job.status }}
           fields: repo,author,action,eventName,ref,workflow
         env:
-          GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
           SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}