ci(mergify): upgrade configuration to current format

.github/mergify.yml

@@ -1,51 +1,90 @@
 pull_request_rules:
-- name: auto-merge
-  description: >
-    Automatic merge of PRs to main
-  conditions:
-    - "#approved-reviews-by>=2"
-    - "#changes-requested-reviews-by=0"
-    - base=main
-    - label!=do-not-merge
-    - label!=needs-rebase
-    - check-success=pre-commit
-    - check-success=e2e-tests
-    - check-success=DCO
-    - check-success=tests
+  - name: keep PRs up to date with main
+    conditions:
+      - -conflict
+      - -draft
+      - -closed
+      - -merged
+      - label!=do-not-merge
+    actions:
+      update: {}
+
+  - name: auto-merge GitHub Actions dependency bumps
+    description: >
+      Automatic merge of GitHub Actions dependency bump PRs with 1 approval
+    conditions:
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - base=main
+      - label!=do-not-merge
+      - label!=needs-rebase
+      - check-success=pre-commit
+      - check-success=e2e-tests
+      - check-success=tests
+      - or:
+          - title~=(?i)bump.*action
+          - title~=(?i)update.*github.*action
+          - label=dependencies
+          - files~=^\.github/workflows/
+    actions:
+      merge:
+        method: squash
+        commit_message_template: |
+          {{ title }} (#{{ number }})
+
+          {{ body }}
+
+          {% for user in approved_reviews_by %}
+          Approved-by: {{ user }}
+          {% endfor %}
+
+  - name: auto-merge
+    description: >
+      Automatic merge of PRs to main
+    conditions:
+      - "#approved-reviews-by>=2"
+      - "#changes-requested-reviews-by=0"
+      - base=main
+      - label!=do-not-merge
+      - label!=needs-rebase
+      - check-success=pre-commit
+      - check-success=e2e-tests
+      - check-success=tests
     # - check-success=build-latest-image # TODO: uncomment this when the credentials are added to the repo
 
-  actions:
-    merge:
-      method: squash
-      commit_message_template: |
-        {{ title }} (#{{ number }})
+    actions:
+      merge:
+        method: squash
+        commit_message_template: |
+          {{ title }} (#{{ number }})
 
-        {{ body }}
+          {{ body }}
 
-        {% for user in approved_reviews_by %}
-        Approved-by: {{ user }}
-        {% endfor %}
-    delete_head_branch:
+          {% for user in approved_reviews_by %}
+          Approved-by: {{ user }}
+          {% endfor %}
 
-- name: ping author on conflicts and add 'needs-rebase' label
-  conditions:
+  - name: ping author on conflicts and add 'needs-rebase' label
+    conditions:
       - conflict
       - -closed
-  actions:
-    label:
-      add:
-        - needs-rebase
-    comment:
-      message: >
-       This pull request has merge conflicts that must be resolved before it
-       can be merged. @{{author}} please rebase it.
-       https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
-
-- name: remove 'needs-rebase' label when conflict is resolved
-  conditions:
+    actions:
+      label:
+        add:
+          - needs-rebase
+      comment:
+        message: >
+          This pull request has merge conflicts that must be resolved before it
+          can be merged. @{{author}} please rebase it.
+          https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork
+
+  - name: remove 'needs-rebase' label when conflict is resolved
+    conditions:
       - -conflict
       - -closed
-  actions:
-    label:
-      remove:
-        - needs-rebase
+    actions:
+      label:
+        remove:
+          - needs-rebase
+merge_protections_settings:
+  reporting_method: check-runs

.github/workflows/build-image.yml

@@ -9,7 +9,7 @@ permissions:
   contents: read
 
 env:
-  IMG: quay.io/llamastack/llama-stack-k8s-operator:latest
+  IMG: quay.io/ogx-ai/ogx-k8s-operator:latest
 
 jobs:
   build-arch:
@@ -27,18 +27,18 @@ jobs:
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
         with:
           go-version-file: go.mod
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5
 
       - name: Login to Quay.io
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: quay.io
           username: ${{ secrets.APP_QUAY_USERNAME }}
@@ -57,10 +57,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5
 
       - name: Login to Quay.io
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: quay.io
           username: ${{ secrets.APP_QUAY_USERNAME }}

.github/workflows/code-coverage.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
         with:
           go-version-file: go.mod
 

.github/workflows/generate-release.yml

@@ -37,7 +37,7 @@ jobs:
       e2e_run_url: ${{ needs.test-e2e.outputs.run_url }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
         with:
           fetch-depth: 0  # Need full history to check existing tags
 
@@ -98,7 +98,7 @@ jobs:
           fi
 
       - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c #v 6.4.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 #v 6.5.0
         with:
           go-version-file: go.mod
 
@@ -109,7 +109,7 @@ jobs:
           make release VERSION=${{ steps.validate.outputs.operator_version }} LLAMASTACK_VERSION=${{ steps.validate.outputs.llamastack_version }}
 
       - name: Set up Python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
+        uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1
         with:
           python-version: '3.12'
 
@@ -118,12 +118,12 @@ jobs:
         continue-on-error: true
         id: precommit
         env:
-          IMG: quay.io/llamastack/llama-stack-k8s-operator:v${{ steps.validate.outputs.operator_version }}
+          IMG: quay.io/ogx-ai/ogx-k8s-operator:v${{ steps.validate.outputs.operator_version }}
 
       - name: Handle pre-commit changes
         shell: bash
         env:
-          IMG: quay.io/llamastack/llama-stack-k8s-operator:v${{ steps.validate.outputs.operator_version }}
+          IMG: quay.io/ogx-ai/ogx-k8s-operator:v${{ steps.validate.outputs.operator_version }}
         run: |
           # Check if there are any modified files after pre-commit
           if [ "${{ steps.precommit.outcome }}" = "failure" ]; then
@@ -183,7 +183,7 @@ jobs:
       - name: Validate release image build
         shell: bash
         run: |
-          make image-build IMG=quay.io/llamastack/llama-stack-k8s-operator:v${{ steps.validate.outputs.operator_version }}
+          make image-build IMG=quay.io/ogx-ai/ogx-k8s-operator:v${{ steps.validate.outputs.operator_version }}
 
       - name: Commit and push changes
         shell: bash
@@ -218,20 +218,20 @@ jobs:
       release_branch: ${{ needs.generate-release.outputs.release_branch }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
         with:
           ref: ${{ env.release_branch }}
 
       - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
         with:
           go-version-file: go.mod
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5
 
       - name: Log in to Quay.io
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: quay.io
           username: ${{ secrets.APP_QUAY_USERNAME }}
@@ -242,7 +242,7 @@ jobs:
           make image-build-push-single \
             CONTAINER_TOOL=docker \
             PLATFORM=${{ matrix.platform }} \
-            IMG=quay.io/llamastack/llama-stack-k8s-operator:v${{ env.operator_version }}-${{ matrix.arch }}
+            IMG=quay.io/ogx-ai/ogx-k8s-operator:v${{ env.operator_version }}-${{ matrix.arch }}
 
   finalize-release:
     needs: [generate-release, build-release-arch]
@@ -251,10 +251,10 @@ jobs:
       operator_version: ${{ needs.generate-release.outputs.operator_version }}
       llamastack_version: ${{ needs.generate-release.outputs.llamastack_version }}
       release_branch: ${{ needs.generate-release.outputs.release_branch }}
-      IMG: quay.io/llamastack/llama-stack-k8s-operator
+      IMG: quay.io/ogx-ai/ogx-k8s-operator
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
         with:
           ref: ${{ env.release_branch }}
           fetch-depth: 0
@@ -293,12 +293,12 @@ jobs:
             Install the operator using kubectl:
 
             \`\`\`bash
-            kubectl apply -f https://raw.githubusercontent.com/llamastack/llama-stack-k8s-operator/v${{ env.operator_version }}/release/operator.yaml
+            kubectl apply -f https://raw.githubusercontent.com/ogx-ai/ogx-k8s-operator/v${{ env.operator_version }}/release/operator.yaml
             \`\`\`
 
             ## Container Images
 
-            - Operator: \`quay.io/llamastack/llama-stack-k8s-operator:v${{ env.operator_version }}\`
+            - Operator: \`quay.io/ogx-ai/ogx-k8s-operator:v${{ env.operator_version }}\`
             - LlamaStack distributions: \`docker.io/llamastack/distribution-*:${{ env.llamastack_version }}\`"
 
             gh release create "v${{ env.operator_version }}" \
@@ -311,10 +311,10 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5
 
       - name: Log in to Quay.io
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: quay.io
           username: ${{ secrets.APP_QUAY_USERNAME }}
@@ -335,5 +335,5 @@ jobs:
           echo "🚀 Release v${{ env.operator_version }} completed successfully!"
           echo "📦 Container image: ${{ env.IMG }}:v${{ env.operator_version }}"
           echo "📝 Release notes: https://github.com/${{ github.repository }}/releases/tag/v${{ env.operator_version }}"
-          echo "🔧 Install with: kubectl apply -f https://raw.githubusercontent.com/llamastack/llama-stack-k8s-operator/v${{ env.operator_version }}/release/operator.yaml"
+          echo "🔧 Install with: kubectl apply -f https://raw.githubusercontent.com/ogx-ai/ogx-k8s-operator/v${{ env.operator_version }}/release/operator.yaml"
           echo "🌿 Release branch: ${{ env.release_branch }}"

.github/workflows/pre-commit.yml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Set up Go env
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
         with:
           go-version-file: go.mod
 

.github/workflows/release-image.yml

@@ -17,7 +17,7 @@ permissions:
   contents: read
 
 env:
-  IMG: quay.io/llamastack/llama-stack-k8s-operator:${{ github.event.inputs.version }}
+  IMG: quay.io/ogx-ai/ogx-k8s-operator:${{ github.event.inputs.version }}
 
 jobs:
   build-arch:
@@ -34,20 +34,20 @@ jobs:
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Set up Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
         with:
           go-version-file: go.mod
 
       - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.inputs.release_branch }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5
 
       - name: Login to Quay.io
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: quay.io
           username: ${{ secrets.APP_QUAY_USERNAME }}
@@ -65,10 +65,10 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5
 
       - name: Login to Quay.io
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
         with:
           registry: quay.io
           username: ${{ secrets.APP_QUAY_USERNAME }}