chore(kuma-dp): cleanup bootstrap version field

Fixes #2986 Signed-off-by: Tharun <rajendrantharun@live.com>
kumahq · Jan 7, 2022 · 9075dc8 · 9075dc8
1 parent 728704b
commit 9075dc8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/app/kuma-dp/pkg/dataplane/envoy/remote_bootstrap.go b/app/kuma-dp/pkg/dataplane/envoy/remote_bootstrap.go
@@ -121,7 +121,6 @@ func (b *remoteBootstrap) requestForBootstrap(url *net_url.URL, cfg kuma_dp.Conf
 		AdminPort:         cfg.Dataplane.AdminPort.Lowest(),
 		DataplaneToken:    token,
 		DataplaneResource: dataplaneResource,
-		BootstrapVersion:  types.BootstrapV3, // set BootstrapVersion to be compatible with old Kuma CPs
 		CaCert:            cfg.ControlPlane.CaCert,
 		Version: types.Version{
 			KumaDp: types.KumaDpVersion{

diff --git a/app/kuma-dp/pkg/dataplane/envoy/remote_bootstrap_test.go b/app/kuma-dp/pkg/dataplane/envoy/remote_bootstrap_test.go
@@ -119,8 +119,7 @@ var _ = Describe("Remote Bootstrap", func() {
 					  "caCert": "",
 					  "dynamicMetadata": {
 					    "test": "value"
-					  },
-                      "bootstrapVersion": "3"
+					  }
 					}`,
 				}
 			}()),
@@ -163,8 +162,7 @@ var _ = Describe("Remote Bootstrap", func() {
                         }
                       },
                       "caCert": "",
-                      "dynamicMetadata": null,
-                      "bootstrapVersion": "3"
+                      "dynamicMetadata": null
                     }`,
 				}
 			}()),
@@ -205,8 +203,7 @@ var _ = Describe("Remote Bootstrap", func() {
                         }
                       },
                       "caCert": "",
-					  "dynamicMetadata": null,
-                      "bootstrapVersion": "3"
+					  "dynamicMetadata": null
                     }`,
 				}
 			}()),

diff --git a/pkg/xds/bootstrap/types/bootstrap_request.go b/pkg/xds/bootstrap/types/bootstrap_request.go
@@ -23,12 +23,8 @@ type BootstrapRequest struct {
 	// CaCert is a PEM-encoded CA cert that DP uses to verify CP
 	CaCert          string            `json:"caCert"`
 	DynamicMetadata map[string]string `json:"dynamicMetadata"`
-	// todo(lobkovilya): delete BootstrapVersion, it's needed to have backward compatibility
-	// between new DPPs and old Kuma CPs. Issue https://github.com/kumahq/kuma/issues/2986
-	// BootstrapVersion is an optional version to override the control plane's default setting
-	BootstrapVersion BootstrapVersion `json:"bootstrapVersion"`
-	DNSPort          uint32           `json:"dnsPort,omitempty"`
-	EmptyDNSPort     uint32           `json:"emptyDnsPort,omitempty"`
+	DNSPort         uint32            `json:"dnsPort,omitempty"`
+	EmptyDNSPort    uint32            `json:"emptyDnsPort,omitempty"`
 }
 
 type Version struct {