release: v1.31.0

.circleci/config.yml

@@ -378,6 +378,9 @@ commands:
                 key: "<< pipeline.parameters.merge_version >>-lint"
                 paths:
                   - target
+  xtask_release_preverify:
+    steps:
+      - run: xtask release pre-verify
 
   xtask_check_helm:
     steps:
@@ -399,6 +402,10 @@ commands:
             # Use helm to template our chart against all kube versions
             TEMPLATE_DIR=$(mktemp -d)
             for kube_version in ${CURRENT_KUBE_VERSIONS}; do
+              # Skip 1.25.14, 1.26.9, 1.27.6 and 1.28.2 until supported by kubeconform
+              if [[ "${kube_version}" == "1.25.14" ]] || [[ "${kube_version}" == "1.26.9" ]] || [[ "${kube_version}" == "1.27.6" ]] || [[ "${kube_version}" == "1.28.2" ]]; then
+                continue
+              fi
               # Use helm to template our chart against kube_version
               helm template --kube-version "${kube_version}" router helm/chart/router --set autoscaling.enabled=true > "${TEMPLATE_DIR}/router-${kube_version}.yaml"
 
@@ -525,6 +532,18 @@ jobs:
             cargo fetch
       - xtask_test:
           variant: "updated"
+  pre_verify_release:
+    environment:
+      <<: *common_job_environment
+    parameters:
+      platform:
+        type: executor
+    executor: << parameters.platform >>
+    steps:
+      - checkout
+      - setup_environment:
+          platform: << parameters.platform >>
+      - xtask_release_preverify
 
   build_release:
     parameters:
@@ -761,6 +780,10 @@ jobs:
             docker buildx inspect --bootstrap
             # Note: GH Token owned by apollo-bot2, no expire
             echo ${GITHUB_OCI_TOKEN} | docker login ghcr.io -u apollo-bot2 --password-stdin
+            # To prevent overwrite, check to see if our images already exists
+            # If the manifest command succeeds, the images already exist
+            docker manifest inspect ${ROUTER_TAG}:${VERSION}  > /dev/null && exit 1
+            docker manifest inspect ${ROUTER_TAG}:${VERSION}-debug  > /dev/null && exit 1
             # Build and push debug image
             docker buildx build --platform linux/amd64,linux/arm64 --push --build-arg DEBUG_IMAGE="true" --build-arg ROUTER_RELEASE=${VERSION} -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:${VERSION}-debug .
             # Build and push release image
@@ -776,6 +799,10 @@ jobs:
             CHART=$(ls -t router*.tgz| head -1)
             # Note: GH Token owned by apollo-bot2, no expire
             echo ${GITHUB_OCI_TOKEN} | helm registry login -u apollo-bot2 --password-stdin ghcr.io
+            # To prevent overwrite, check to see if our chart already exists
+            # If the show all command succeeds, the chart already exists
+            VERSION=$(basename ${CHART} .tgz)
+            helm show all oci://ghcr.io/apollographql/helm-charts/router --version ${VERSION} > /dev/null && exit 1
             # Push chart to repository
             helm push ${CHART} oci://ghcr.io/apollographql/helm-charts
 
@@ -831,7 +858,17 @@ workflows:
     when:
       not: << pipeline.parameters.nightly >>
     jobs:
+      - pre_verify_release:
+          matrix:
+            parameters:
+              platform: [ amd_linux_build ]
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /v.*/
       - build_release:
+          requires: [ pre_verify_release ]
           matrix:
             parameters:
               platform:

.github/pull_request_template.md

@@ -1,12 +1,13 @@
 *Description here*
 
-Fixes #issue_number
+Fixes #**issue_number**
 
 <!-- start metadata -->
+---
 
 **Checklist**
 
-Complete the checklist (and note appropriate exceptions) before a final PR is raised.
+Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.
 
 - [ ] Changes are compatible[^1]
 - [ ] Documentation[^2] completed
@@ -22,8 +23,6 @@ Complete the checklist (and note appropriate exceptions) before a final PR is ra
 
 **Notes**
 
-[^1]. It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this.
-[^2]. Configuration is an important part of many changes. Where applicable please try to document configuration examples.
-[^3]. Tick whichever testing boxes are applicable. If you are adding Manual Tests:
-    - please document the manual testing (extensively) in the Exceptions.
-    - please raise a separate issue to automate the test and label it (or ask for it to be labeled) as `manual test`
+[^1]: It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this.
+[^2]: Configuration is an important part of many changes. Where applicable please try to document configuration examples.
+[^3]: Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions.

.gitleaks.toml

@@ -14,17 +14,25 @@
     [ rules.allowlist ]
         commits = [
             "7fdb0a5a0831d309524e98503760c16bd3de160c",
-            # Example private key for test cases
+            # Example private keys for test cases
             "9d6464b96eed3a20c48d5ec653bf9986757c89e5",
-
+            "74ebb0269933c703efd9143c029f69e30330478b",
         ]
 
 [[ rules ]]
     id = "jwt"
     [ rules.allowlist ]
         commits = [
-            # Example jwt
+            # Example jwts
             "f12bcddc663aa4c4d90218a1bb718fe74e0e7be3",
+            "6ff43869e0cf8ab0de8dd0e898f80c08ad135552",
+            "b11412918d58db34693488b29495e148dbb27cc2",
+            "a4ceefc8d51879330f10861438401a3a3deb316e",
+            "d19de3cbca36981676ff03c7f3cab113609772b1",
+            "3ee3d4bda9efcf4f175fdcfd59abc16cb9a4657e",
+            "76aaa5ec21d4fbde65676c6cf0dc265dd6daee99",
+            "d2b85acee5cf94120b47093f87ae80a7365d7b28",
+            "f107c2a42292d0c8068395f5cb8f491377559a42",
         ]
 
 [[ rules ]]