Merge upstream changes to main

.github/workflows/pull_request.yml

@@ -12,9 +12,7 @@ on:
       - 'config/'
 env:
   DOCKER_FILE_PATH: Dockerfile
-  GOLANG_VERSION: 1.21
   HELM_VERSION: v3.8.2
-  KIND_VERSION: "v0.17.0"
   REGISTRY: ghcr.io
 
 jobs:
@@ -31,12 +29,12 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: ${{ env.GOLANG_VERSION }}
+        go-version-file: go.mod
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.54
+        version: v1.64
         only-new-issues: false
         args: --timeout 10m
 
@@ -50,27 +48,6 @@ jobs:
       run: |
         helm lint charts/ingressmonitorcontroller
 
-    # - name: Install kind
-    #   uses: engineerd/[email protected]
-    #   with:
-    #     version:  ${{ env.KIND_VERSION }}
-
-    # - name: Check cluster info
-    #   run: |
-    #     kubectl version --client
-    #     kind version
-    #     kind version | grep -q ${KIND_VERSION}
-
-    # - name: Set up Cluster
-    #   run: |
-    #     kubectl cluster-info
-    #     make install
-    #     mkdir -p .local
-    #     echo "${{ secrets.SECRET_KUBERNETES_RESOURCES }}" | base64 --decode > .local/test-config.yaml
-
-    # - name: Test
-    #   run: make test
-
     - name: Generate Tag
       id: generate_tag
       run: |
@@ -93,7 +70,7 @@ jobs:
     # To identify any broken changes in dockerfiles or dependencies
 
     - name: Build image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ${{ env.DOCKER_FILE_PATH  }}
@@ -107,5 +84,4 @@ jobs:
           ${{ env.GHCR_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 }}

.github/workflows/pull_request_test.yaml

@@ -0,0 +1,60 @@
+name: Run Tests on PR Label
+
+on:
+  pull_request:
+    branches:
+      - 'master'
+    paths-ignore:
+      - '*.md'
+      - 'docs/'
+      - 'examples/'
+      - 'hack/'
+      - 'config/'
+    types: [ labeled ]
+
+env:
+  KIND_VERSION: "v0.25.0"
+
+jobs:
+
+  test:
+    runs-on: ubuntu-latest
+    name: Test
+    if: ${{ github.event.label.name == 'ok-to-test' }}
+    steps:
+
+    - name: Remove the test label
+      uses: actions-ecosystem/action-remove-labels@v1
+      with:
+        labels: ok-to-test
+
+    - name: Check out code
+      uses: actions/checkout@v4
+      with:
+        ref: ${{github.event.pull_request.head.sha}}
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
+
+    - name: Install kind
+      uses: engineerd/[email protected]
+      with:
+        version: ${{ env.KIND_VERSION }}
+
+    - name: Check cluster info
+      run: |
+        kubectl version --client
+        kind version
+        kind version | grep -q ${KIND_VERSION}
+
+    - name: Set up Cluster
+      run: |
+        kubectl cluster-info
+        make install
+        mkdir -p .local
+        echo "${{ secrets.IMC_GITHUB_PIPELINE_CONFIG_ENCODED }}" | base64 --decode > .local/test-config.yaml
+
+    - name: Test
+      run: make test

.github/workflows/push.yml

@@ -14,9 +14,8 @@ on:
 env:
   DOCKER_FILE_PATH: Dockerfile
   BUNDLE_DOCKER_FILE_PATH: bundle.Dockerfile
-  GOLANG_VERSION: 1.21
-  OPERATOR_SDK_VERSION: "1.19.0"
-  KUSTOMIZE_VERSION: "4.5.7"
+  OPERATOR_SDK_VERSION: "1.39.2"
+  KUSTOMIZE_VERSION: "5.4.3"
   KUBERNETES_VERSION: "1.23.5"
   KIND_VERSION: "v0.17.0"
   HELM_REGISTRY_URL: ""
@@ -39,12 +38,12 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: ${{ env.GOLANG_VERSION }}
+        go-version-file: go.mod
 
     - name: Lint
-      uses: golangci/golangci-lint-action@v3
+      uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.54
+        version: v1.64
         only-new-issues: false
         args: --timeout 10m
 
@@ -74,7 +73,7 @@ jobs:
         kubectl cluster-info
         make install
         mkdir -p .local
-        echo "${{ secrets.SECRET_KUBERNETES_RESOURCES }}" | base64 --decode > .local/test-config.yaml
+        echo "${{ secrets.IMC_GITHUB_PIPELINE_CONFIG_ENCODED }}" | base64 --decode > .local/test-config.yaml
 
     - name: Test
       run: make test
@@ -108,7 +107,7 @@ jobs:
         echo GHCR_IMAGE_REPOSITORY=${{env.REGISTRY}}/$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
     - name: Build and Push image to ghcr registry
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ${{ env.DOCKER_FILE_PATH  }}
@@ -124,3 +123,137 @@ jobs:
           org.opencontainers.image.source=${{ github.event.repository.clone_url }}
           org.opencontainers.image.created=${{ steps.prep.outputs.created }}
           org.opencontainers.image.revision=${{ github.sha }}
+
+    - name: Login to Dockerhub Registry
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.STAKATER_DOCKERHUB_USERNAME }}
+        password: ${{ secrets.STAKATER_DOCKERHUB_PASSWORD }}
+
+    - name: Generate image repository path for DockerHub registry
+      run: |
+        echo IMAGE_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+
+    - name: Build and push image to DockerHub registry
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        file: ${{ env.DOCKER_FILE_PATH  }}
+        pull: true
+        push: true
+        build-args: BUILD_PARAMETERS=${{ env.BUILD_PARAMETERS }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        platforms: linux/amd64,linux/arm,linux/arm64
+        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 }}
+
+    ##############################
+    ## 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.PUBLISH_TOKEN }}
+        WITH_V: false
+        DEFAULT_BUMP: patch
+        DRY_RUN: true
+
+    # Install operator-sdk
+    - name: Install operator-sdk
+      uses: redhat-actions/openshift-tools-installer@v1
+      with:
+        source: "github"
+        operator-sdk: ${{ env.OPERATOR_SDK_VERSION }}
+
+    # Install kustomize
+    - name: Install kustomize
+      uses: imranismail/setup-kustomize@v2
+      with:
+        kustomize-version: ${{ env.KUSTOMIZE_VERSION }}
+
+    - name: Generate Bundle
+      env:
+        VERSION: ${{ steps.generate_operator_tag.outputs.new_tag }}
+        IMG: ${{ env.IMAGE_REPOSITORY }}:${{ steps.generate_tag.outputs.new_tag }}
+      run: make bundle
+
+    - name: Verify bundle
+      run: operator-sdk bundle validate ./bundle --select-optional name=operatorhub
+
+    - name: Build and push Bundle Image
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        file: ${{ env.BUNDLE_DOCKER_FILE_PATH  }}
+        pull: true
+        push: true
+        cache-to: type=inline
+        tags: |
+          ${{ env.IMAGE_REPOSITORY }}-bundle:${{ 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 }}
+
+    # 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: Update Chart CRDs
+      run: make generate-crds
+
+    # Publish helm chart
+    - name: Publish Helm chart
+      uses: stefanprodan/helm-gh-pages@master
+      with:
+        branch: master
+        repository: stakater-charts
+        target_dir: docs
+        token: ${{ secrets.GHCR_TOKEN }}
+        charts_dir: charts/
+        charts_url: ${{ env.HELM_REGISTRY_URL }}
+        owner: stakater
+        linting: on
+        commit_username: stakater-user
+        commit_email: [email protected]
+
+    # Commit back changes
+    - 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.PUBLISH_TOKEN }}
+
+    # Push Latest Tag
+    - name: Push Latest Tag
+      uses: anothrNick/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
+        WITH_V: true
+        DEFAULT_BUMP: patch
+
+    - 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:
+        SLACK_WEBHOOK_URL: ${{ secrets.STAKATER_DELIVERY_SLACK_WEBHOOK }}

.github/workflows/release.yml

@@ -5,9 +5,6 @@ on:
     tags:
       - "v*"
 
-env:
-  GOLANG_VERSION: 1.21
-
 jobs:
   build:
     name: GoReleaser build
@@ -22,12 +19,12 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GOLANG_VERSION }}
+          go-version-file: go.mod
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@master
+        uses: goreleaser/goreleaser-action@v6
         with:
-          version: latest
+          version: '~> v2'
           args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,6 +1,5 @@
 vendor
 .idea
-\.vscode/
 out
 /IngressMonitorController
 /build/_output/bin/

.goreleaser.yml

@@ -1,4 +1,6 @@
 # .goreleaser.yml
+version: 2
+
 before:
   hooks:
     - go mod download
@@ -15,10 +17,11 @@ builds:
   - amd64
   - arm
   - arm64
+  main: ./cmd
 archives:
 - name_template: "{{ .ProjectName }}_v{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  version_template: "{{ .Tag }}-next"
 checksum:
   name_template: "{{ .ProjectName }}_{{ .Version }}_checksums.txt"
 changelog:

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Package",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${workspaceFolder}/main.go",
+            "env": {
+              "OPERATOR_NAMESPACE": "stakater-ingress-monitor-controller"
+            }
+        }
+
+    ]
+}