From 0c80c2c53ec82b1c3db77dd211e39b7fd38f9d60 Mon Sep 17 00:00:00 2001
From: Xumin <100666470+StarlightIbuki@users.noreply.github.com>
Date: Wed, 22 Feb 2023 16:32:31 +0800
Subject: [PATCH] fix(clustering/compat): compatibility for plugn fields
 (#10346)

For 3.2, we added `aws_imds_protocol_version` config for `aws_lambda` plugin, and `aws_imds_protocol_version` config for `zipkin` plugin, but we did not add corresponding `removed_fields` entries. Which causes Hybrid mode sync to older versions of Kong to fail.

Fix KAG-725

Co-authored-by: Chrono <chronolaw@gmail.com>
(cherry picked from commit 2a23672d9e9e1083f219123e7318d838e180bbc7)
---
 CHANGELOG.md                              | 7 +++++++
 kong/clustering/compat/removed_fields.lua | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1a18f0b7d1d..c153b5a89a92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,13 @@
 - Bumped lua-resty-session from 4.0.2 to 4.0.3
   [#10338](https://github.com/Kong/kong/pull/10338)
 
+### Fix
+
+#### Core
+
+- Fix an issue where control plane does not downgrade config for `aws_lambda` and `zipkin` for older version of data planes.
+  [#10346](https://github.com/Kong/kong/pull/10346)
+
 ## 3.2.0
 
 ### Breaking Changes
diff --git a/kong/clustering/compat/removed_fields.lua b/kong/clustering/compat/removed_fields.lua
index 1b1a392267fb..66a650fc0e2d 100644
--- a/kong/clustering/compat/removed_fields.lua
+++ b/kong/clustering/compat/removed_fields.lua
@@ -48,5 +48,11 @@ return {
       "response_headers",
       "request_headers",
     },
+    aws_lambda = {
+      "aws_imds_protocol_version",
+    },
+    zipkin = {
+      "phase_duration_flavor",
+    }
   },
 }