From 2f55bf621c78b4b76fab428181574d99ebeef1c0 Mon Sep 17 00:00:00 2001
From: Christopher Tauchen <chris.tauchen@tigera.io>
Date: Sat, 13 Jun 2026 08:03:31 +0100
Subject: [PATCH] DOCS-2906: Publish Calico Open Source 3.31.6

Placeholder release notes for Calico Open Source 3.31.6 (June 17, 2026 dateline).
Operator number left as-is, to be updated when actual release content lands.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../version-3.31/release-notes/index.mdx      |  12 +++
 .../version-3.31/releases.json                | 100 +++++++++++++++++-
 .../version-3.31/variables.js                 |   4 +-
 3 files changed, 113 insertions(+), 3 deletions(-)

diff --git a/calico_versioned_docs/version-3.31/release-notes/index.mdx b/calico_versioned_docs/version-3.31/release-notes/index.mdx
index 5e058f8952..de5f099f90 100644
--- a/calico_versioned_docs/version-3.31/release-notes/index.mdx
+++ b/calico_versioned_docs/version-3.31/release-notes/index.mdx
@@ -341,4 +341,16 @@ April 14, 2026
 
 #### Updating
 
+To update a previous version of Calico, see [our upgrade guides](../operations/upgrading/index.mdx).
+
+### Calico Open Source 3.31.6 bug fix release
+
+June 17, 2026
+
+#### Bug fixes
+
+- TBD
+
+#### Updating
+
 To update a previous version of Calico, see [our upgrade guides](../operations/upgrading/index.mdx).
\ No newline at end of file
diff --git a/calico_versioned_docs/version-3.31/releases.json b/calico_versioned_docs/version-3.31/releases.json
index 48d3db0f02..26cb857379 100644
--- a/calico_versioned_docs/version-3.31/releases.json
+++ b/calico_versioned_docs/version-3.31/releases.json
@@ -1,4 +1,102 @@
 [
+  {
+    "title": "v3.31.6",
+    "tigera-operator": {
+      "image": "tigera/operator",
+      "registry": "quay.io",
+      "version": "v1.40.8"
+    },
+    "components": {
+      "calico/typha": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/ctl": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/node": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/node-windows": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/cni": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/cni-windows": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/apiserver": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/kube-controllers": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/envoy-gateway": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/envoy-proxy": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/envoy-ratelimit": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/flannel-migration-controller": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "flannel": {
+        "version": "v0.24.4",
+        "registry": "docker.io"
+      },
+      "calico/dikastes": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "flexvol": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/csi": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/node-driver-registrar": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/pod2daemon-flexvol": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/key-cert-provisioner": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/goldmane": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/whisker": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      },
+      "calico/whisker-backend": {
+        "version": "v3.31.6",
+        "registry": "quay.io"
+      }
+    }
+  },
   {
     "title": "v3.31.5",
     "tigera-operator": {
@@ -587,4 +685,4 @@
       }
     }
   }
-]
\ No newline at end of file
+]
diff --git a/calico_versioned_docs/version-3.31/variables.js b/calico_versioned_docs/version-3.31/variables.js
index 448892c86e..a14bf1d48b 100644
--- a/calico_versioned_docs/version-3.31/variables.js
+++ b/calico_versioned_docs/version-3.31/variables.js
@@ -1,7 +1,7 @@
 const releases = require('./releases.json');
 
 const variables = {
-  releaseTitle: 'v3.31.5',
+  releaseTitle: 'v3.31.6',
   prodname: 'Calico',
   prodnamedash: 'calico',
   version: 'v3.31',
@@ -16,7 +16,7 @@ const variables = {
   noderunning: 'calico-node',
   rootDirWindows: 'C:\\CalicoWindows',
   ppa_repo_name: 'calico-3.31',
-  manifestsUrl: 'https://raw.githubusercontent.com/projectcalico/calico/v3.31.5',
+  manifestsUrl: 'https://raw.githubusercontent.com/projectcalico/calico/v3.31.6',
   releases,
   registry: '',
   vppbranch: 'v3.31.0',