Merge remote-tracking branch 'upstream/master'

stakater · Aug 16, 2024 · 0071048 · 0071048
2 parents 5d8622b + bb1afc2
commit 0071048
Show file tree

Hide file tree

Showing 13 changed files with 534 additions and 213 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -37,6 +37,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         ref: ${{github.event.pull_request.head.sha}}
+        fetch-depth: 0
 
     # Setting up helm binary
     - name: Set up Helm
@@ -54,6 +55,13 @@ jobs:
         check-latest: true
         cache: true
 
+    # Get highest tag and remove any suffixes with '-'
+    - name: Get Highest tag
+      id: highest_tag
+      run: |
+        highest=$(git tag -l --sort -version:refname | head -n 1)
+        echo "tag=${highest%%-*}" >> $GITHUB_OUTPUT
+
     - name: Install Dependencies
       run: |
         make install
@@ -139,7 +147,7 @@ jobs:
         push: false
         build-args: |
           BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
-          BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.GIT_TAG }}
+          BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.highest_tag.outputs.tag }}
         cache-to: type=inline
         platforms: linux/amd64,linux/arm64
         tags: |

diff --git a/.github/workflows/pull_request_docs.yaml b/.github/workflows/pull_request_docs.yaml
@@ -1,7 +1,7 @@
 name: Pull Request for Documentation Changes
 
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - master
     paths:
@@ -20,12 +20,3 @@ jobs:
       MD_CONFIG: .github/md_config.json
       DOC_SRC: docs
       MD_LINT_CONFIG: .markdownlint.yaml
-  build:
-    uses: stakater/.github/.github/workflows/[email protected]
-    with:
-      DOCKER_FILE_PATH: Dockerfile-docs
-    secrets:
-      CONTAINER_REGISTRY_URL: ghcr.io/stakater/docs
-      CONTAINER_REGISTRY_USERNAME: stakater-user
-      CONTAINER_REGISTRY_PASSWORD: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -1,18 +1,11 @@
 name: Push
 
 on:
-  push:
+  pull_request:
+    types:
+      - closed
     branches:
       - master
-    paths:
-      - '**'
-      - '!.markdownlint.yaml'
-      - '!.vale.ini'
-      - '!Dockerfile-docs'
-      - '!docs-nginx.conf'
-      - '!docs/**'
-      - '!theme_common'
-      - '!theme_override'
 
 env:
   DOCKER_FILE_PATH: Dockerfile
@@ -25,7 +18,7 @@ env:
 jobs:
   build:
     name: Build
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
+    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
 
     steps:
@@ -81,15 +74,6 @@ jobs:
       - name: Test
         run: make test
 
-      - name: Generate Tag
-        id: generate_tag
-        uses: anothrNick/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-          WITH_V: true
-          DEFAULT_BUMP: patch
-          DRY_RUN: true
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
@@ -117,7 +101,7 @@ jobs:
           cache-to: type=inline
           platforms: linux/amd64,linux/arm,linux/arm64
           tags: |
-            ${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}
+            ${{ env.DOCKER_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}
           labels: |
             org.opencontainers.image.source=${{ github.event.repository.clone_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
@@ -132,11 +116,11 @@ jobs:
           push: true
           build-args: |
             BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
-            BUILDER_IMAGE=${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}
+            BUILDER_IMAGE=${{ env.DOCKER_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}
           cache-to: type=inline
           platforms: linux/amd64,linux/arm64
           tags: |
-            ${{ env.DOCKER_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}-ubi
+            ${{ env.DOCKER_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}-ubi
           labels: |
             org.opencontainers.image.source=${{ github.event.repository.clone_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
@@ -164,7 +148,7 @@ jobs:
           cache-to: type=inline
           platforms: linux/amd64,linux/arm,linux/arm64
           tags: |
-            ${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}
+            ${{ env.GHCR_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}
           labels: |
             org.opencontainers.image.source=${{ github.event.repository.clone_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
@@ -179,11 +163,44 @@ jobs:
           push: true
           build-args: |
             BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
-            BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}
+            BUILDER_IMAGE=${{ env.GHCR_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}
           cache-to: type=inline
           platforms: linux/amd64,linux/arm64
           tags: |
-            ${{ env.GHCR_IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}-ubi
+            ${{ env.GHCR_IMAGE_REPOSITORY }}:merge-${{ github.event.number }}-ubi
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.clone_url }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
+
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            docs:
+              - '.markdownlint.yaml'
+              - '.vale.ini'
+              - 'Dockerfile-docs'
+              - 'docs-nginx.conf'
+              - 'docs/**'
+              - 'README.md'
+              - 'theme_common'
+              - 'theme_override'
+
+      # run only if 'docs' files were changed
+      - name: Build and Push Docker Image for Docs to ghcr registry
+        if: steps.filter.outputs.docs == 'true'
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: Dockerfile-docs
+          pull: true
+          push: true
+          build-args: BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
+          cache-to: type=inline
+          platforms: linux/amd64,linux/arm,linux/arm64
+          tags: |
+            ${{ env.GHCR_IMAGE_REPOSITORY }}/docs:merge-${{ github.event.number }}
           labels: |
             org.opencontainers.image.source=${{ github.event.repository.clone_url }}
             org.opencontainers.image.created=${{ steps.prep.outputs.created }}
@@ -193,90 +210,78 @@ jobs:
       ## Add steps to generate required artifacts for a release here(helm chart, operator manifest etc.)
       ##############################
 
-      # Generate tag for operator without "v"
-      - name: Generate Operator Tag
-        id: generate_operator_tag
-        uses: anothrNick/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-          WITH_V: false
-          DEFAULT_BUMP: patch
-          DRY_RUN: true
+      # Skip pushing plain manifests till we decide what to do with them
 
-      # Update chart tag to the latest semver tag
-      - name: Update Chart Version
-        env:
-          VERSION: ${{ steps.generate_operator_tag.outputs.new_tag }}
-        run: make bump-chart
-
-      - name: Helm Template
-        run: |
-          helm template reloader deployments/kubernetes/chart/reloader/ \
-            --set-string reloader.deployment.resources.limits.cpu=1 \
-            --set reloader.deployment.resources.limits.memory=128Mi \
-            --set reloader.deployment.resources.requests.cpu=10m \
-            --set reloader.deployment.resources.requests.memory=128Mi > deployments/kubernetes/reloader.yaml
+      # - name: Helm Template
+      #   run: |
+      #     helm template reloader deployments/kubernetes/chart/reloader/ \
+      #       --set reloader.deployment.resources.limits.cpu=150m \
+      #       --set reloader.deployment.resources.limits.memory=512Mi \
+      #       --set reloader.deployment.resources.requests.cpu=10m \
+      #       --set reloader.deployment.resources.requests.memory=128Mi > deployments/kubernetes/reloader.yaml
 
-          helm template reloader deployments/kubernetes/chart/reloader/ --output-dir deployments/kubernetes/manifests && mv deployments/kubernetes/manifests/reloader/templates/* deployments/kubernetes/manifests/ && rm -r deployments/kubernetes/manifests/reloader
-
-      - name: Remove labels and annotations from manifests
-        run: make remove-labels-annotations
-
-      # Publish helm chart
-      - name: Login to ghcr via helm
-        run: |
-          echo ${{secrets.GITHUB_TOKEN}} | helm registry login ghcr.io/stakater --username stakater-user --password-stdin
-
-      - name: Publish Helm chart to ghcr.io
-        run: |
-          helm package ./deployments/kubernetes/chart/reloader --destination ./packaged-chart
-          helm push ./packaged-chart/*.tgz oci://ghcr.io/stakater/charts
-          rm -rf ./packaged-chart
-
-      - name: Publish Helm chart to gh-pages
-        uses: stefanprodan/helm-gh-pages@master
-        with:
-          branch: master
-          repository: stakater-charts
-          target_dir: docs
-          token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-          charts_dir: deployments/kubernetes/chart/
-          charts_url: ${{ env.HELM_REGISTRY_URL }}
-          owner: stakater
-          linting: on
-          commit_username: stakater-user
-          commit_email: [email protected]
-
-      # Commit back changes
-      - name: Log info about `.git` directory permissions
-        run: |
-          # Debug logging
-          echo "Disk usage: "
-          df -H
-
-          echo ".git files not owned by current user or current group:"
-          find .git ! -user $(id -u) -o ! -group $(id -g) | xargs ls -lah
-
-      - name: Commit files
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "stakater-user"
-          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 }}
-          branch: ${{ github.ref }}
-
-      - name: Push Latest Tag
-        uses: anothrNick/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
-          WITH_V: true
-          DEFAULT_BUMP: patch
+      #     helm template reloader deployments/kubernetes/chart/reloader/ --output-dir deployments/kubernetes/manifests && mv deployments/kubernetes/manifests/reloader/templates/* deployments/kubernetes/manifests/ && rm -r deployments/kubernetes/manifests/reloader
+
+      # - name: Remove labels and annotations from manifests
+      #   run: make remove-labels-annotations
+
+      # Charts are to be pushed to a separate repo with a separate release cycle
+
+      # # Publish helm chart
+      # - name: Login to ghcr via helm
+      #   run: |
+      #     echo ${{secrets.GITHUB_TOKEN}} | helm registry login ghcr.io/stakater --username stakater-user --password-stdin
+
+      # - name: Publish Helm chart to ghcr.io
+      #   run: |
+      #     helm package ./deployments/kubernetes/chart/reloader --destination ./packaged-chart
+      #     helm push ./packaged-chart/*.tgz oci://ghcr.io/stakater/charts
+      #     rm -rf ./packaged-chart
+
+      # - name: Publish Helm chart to gh-pages
+      #   uses: stefanprodan/helm-gh-pages@master
+      #   with:
+      #     branch: master
+      #     repository: stakater-charts
+      #     target_dir: docs
+      #     token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+      #     charts_dir: deployments/kubernetes/chart/
+      #     charts_url: ${{ env.HELM_REGISTRY_URL }}
+      #     owner: stakater
+      #     linting: on
+      #     commit_username: stakater-user
+      #     commit_email: [email protected]
+
+      # # Commit back changes
+      # - name: Log info about `.git` directory permissions
+      #   run: |
+      #     # Debug logging
+      #     echo "Disk usage: "
+      #     df -H
+
+      #     echo ".git files not owned by current user or current group:"
+      #     find .git ! -user $(id -u) -o ! -group $(id -g) | xargs ls -lah
+
+      # - name: Commit files
+      #   run: |
+      #     git config --local user.email "[email protected]"
+      #     git config --local user.name "stakater-user"
+      #     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 }}
+      #     branch: ${{ github.ref }}
+
+      # - name: Push Latest Tag
+      #   uses: anothrNick/[email protected]
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
+      #     WITH_V: true
+      #     DEFAULT_BUMP: patch
 
       - name: Notify Slack
         uses: 8398a7/action-slack@v3

diff --git a/.github/workflows/push_docs.yaml b/.github/workflows/push_docs.yaml