[hotfix-v0.35] Add the next-cluster-version-compatible flag to the generated configmap. (#1293)

Co-authored-by: Shreyas S <shreyas.s@sap.com>

Author: gardener-ci-robot

internal/component/configmap/configmap_test.go

@@ -184,17 +184,6 @@ func TestPrepareInitialCluster(t *testing.T) {
 	}
 }
 
-func buildEtcd(replicas int32, clientTLSEnabled, peerTLSEnabled bool) *druidv1alpha1.Etcd {
-	etcdBuilder := testutils.EtcdBuilderWithDefaults(testutils.TestEtcdName, testutils.TestNamespace).WithReplicas(replicas)
-	if clientTLSEnabled {
-		etcdBuilder.WithClientTLS()
-	}
-	if peerTLSEnabled {
-		etcdBuilder.WithPeerTLS()
-	}
-	return etcdBuilder.Build()
-}
-
 func TestSyncWhenConfigMapExists(t *testing.T) {
 	testCases := []struct {
 		name        string
@@ -298,6 +287,17 @@ func TestTriggerDelete(t *testing.T) {
 }
 
 // ---------------------------- Helper Functions -----------------------------
+func buildEtcd(replicas int32, clientTLSEnabled, peerTLSEnabled bool) *druidv1alpha1.Etcd {
+	etcdBuilder := testutils.EtcdBuilderWithDefaults(testutils.TestEtcdName, testutils.TestNamespace).WithReplicas(replicas)
+	if clientTLSEnabled {
+		etcdBuilder.WithClientTLS()
+	}
+	if peerTLSEnabled {
+		etcdBuilder.WithPeerTLS()
+	}
+	return etcdBuilder.Build()
+}
+
 func newConfigMap(g *WithT, etcd *druidv1alpha1.Etcd) *corev1.ConfigMap {
 	cm := emptyConfigMap(getObjectKey(etcd.ObjectMeta))
 	err := buildResource(etcd, cm)
@@ -334,16 +334,17 @@ func matchConfigMap(g *WithT, etcd *druidv1alpha1.Etcd, actualConfigMap corev1.C
 	err := yaml.Unmarshal([]byte(actualETCDConfigYAML), &actualETCDConfig)
 	g.Expect(err).ToNot(HaveOccurred())
 	g.Expect(actualETCDConfig).To(MatchKeys(IgnoreExtras|IgnoreMissing, Keys{
-		"name":                      Equal("etcd-config"),
-		"data-dir":                  Equal(fmt.Sprintf("%s/new.etcd", common.VolumeMountPathEtcdData)),
-		"metrics":                   Equal(string(druidv1alpha1.Basic)),
-		"snapshot-count":            Equal(ptr.Deref(etcd.Spec.Etcd.SnapshotCount, defaultSnapshotCount)),
-		"enable-v2":                 Equal(false),
-		"quota-backend-bytes":       Equal(etcd.Spec.Etcd.Quota.Value()),
-		"initial-cluster-token":     Equal("etcd-cluster"),
-		"initial-cluster-state":     Equal("new"),
-		"auto-compaction-mode":      Equal(string(ptr.Deref(etcd.Spec.Common.AutoCompactionMode, druidv1alpha1.Periodic))),
-		"auto-compaction-retention": Equal(ptr.Deref(etcd.Spec.Common.AutoCompactionRetention, defaultAutoCompactionRetention)),
+		"name":                            Equal("etcd-config"),
+		"data-dir":                        Equal(fmt.Sprintf("%s/new.etcd", common.VolumeMountPathEtcdData)),
+		"metrics":                         Equal(string(druidv1alpha1.Basic)),
+		"snapshot-count":                  Equal(ptr.Deref(etcd.Spec.Etcd.SnapshotCount, defaultSnapshotCount)),
+		"enable-v2":                       Equal(false),
+		"quota-backend-bytes":             Equal(etcd.Spec.Etcd.Quota.Value()),
+		"initial-cluster-token":           Equal("etcd-cluster"),
+		"initial-cluster-state":           Equal("new"),
+		"auto-compaction-mode":            Equal(string(ptr.Deref(etcd.Spec.Common.AutoCompactionMode, druidv1alpha1.Periodic))),
+		"auto-compaction-retention":       Equal(ptr.Deref(etcd.Spec.Common.AutoCompactionRetention, defaultAutoCompactionRetention)),
+		"next-cluster-version-compatible": Equal(true),
 	}))
 	matchClientTLSRelatedConfiguration(g, etcd, actualETCDConfig)
 	matchPeerTLSRelatedConfiguration(g, etcd, actualETCDConfig)

internal/component/configmap/etcdconfig.go

@@ -50,6 +50,8 @@ type etcdConfig struct {
 	AdvertiseClientUrls     map[string][]string          `json:"advertise-client-urls"`
 	ClientSecurity          *securityConfig              `json:"client-transport-security,omitempty"`
 	PeerSecurity            *securityConfig              `json:"peer-transport-security,omitempty"`
+	//TODO: (@Shreyas-s14): remove this field once etcd 3.5.26 is the minimum supported version.
+	NextClusterVersionCompatible bool `json:"next-cluster-version-compatible,omitempty"`
 }
 
 type securityConfig struct {
@@ -65,22 +67,23 @@ func createEtcdConfig(etcd *druidv1alpha1.Etcd) *etcdConfig {
 	peerScheme, peerSecurityConfig := getSchemeAndSecurityConfig(etcd.Spec.Etcd.PeerUrlTLS, common.VolumeMountPathEtcdPeerCA, common.VolumeMountPathEtcdPeerServerTLS)
 	peerSvcName := druidv1alpha1.GetPeerServiceName(etcd.ObjectMeta)
 	cfg := &etcdConfig{
-		Name:                    "etcd-config",
-		DataDir:                 defaultDataDir,
-		Metrics:                 ptr.Deref(etcd.Spec.Etcd.Metrics, druidv1alpha1.Basic),
-		SnapshotCount:           getSnapshotCount(etcd),
-		EnableV2:                false,
-		EnableGRPCGateway:       ptr.Deref(etcd.Spec.Etcd.EnableGRPCGateway, false),
-		QuotaBackendBytes:       getDBQuotaBytes(etcd),
-		InitialClusterToken:     defaultInitialClusterToken,
-		InitialClusterState:     defaultInitialClusterState,
-		InitialCluster:          prepareInitialCluster(etcd, peerScheme),
-		AutoCompactionMode:      ptr.Deref(etcd.Spec.Common.AutoCompactionMode, druidv1alpha1.Periodic),
-		AutoCompactionRetention: ptr.Deref(etcd.Spec.Common.AutoCompactionRetention, defaultAutoCompactionRetention),
-		ListenPeerUrls:          fmt.Sprintf("%s://0.0.0.0:%d", peerScheme, ptr.Deref(etcd.Spec.Etcd.ServerPort, common.DefaultPortEtcdPeer)),
-		ListenClientUrls:        fmt.Sprintf("%s://0.0.0.0:%d", clientScheme, ptr.Deref(etcd.Spec.Etcd.ClientPort, common.DefaultPortEtcdClient)),
-		AdvertisePeerUrls:       getAdvertiseURLs(etcd, advertiseURLTypePeer, peerScheme, peerSvcName),
-		AdvertiseClientUrls:     getAdvertiseURLs(etcd, advertiseURLTypeClient, clientScheme, peerSvcName),
+		Name:                         "etcd-config",
+		DataDir:                      defaultDataDir,
+		Metrics:                      ptr.Deref(etcd.Spec.Etcd.Metrics, druidv1alpha1.Basic),
+		SnapshotCount:                getSnapshotCount(etcd),
+		EnableV2:                     false,
+		EnableGRPCGateway:            ptr.Deref(etcd.Spec.Etcd.EnableGRPCGateway, false),
+		QuotaBackendBytes:            getDBQuotaBytes(etcd),
+		InitialClusterToken:          defaultInitialClusterToken,
+		InitialClusterState:          defaultInitialClusterState,
+		InitialCluster:               prepareInitialCluster(etcd, peerScheme),
+		AutoCompactionMode:           ptr.Deref(etcd.Spec.Common.AutoCompactionMode, druidv1alpha1.Periodic),
+		AutoCompactionRetention:      ptr.Deref(etcd.Spec.Common.AutoCompactionRetention, defaultAutoCompactionRetention),
+		ListenPeerUrls:               fmt.Sprintf("%s://0.0.0.0:%d", peerScheme, ptr.Deref(etcd.Spec.Etcd.ServerPort, common.DefaultPortEtcdPeer)),
+		ListenClientUrls:             fmt.Sprintf("%s://0.0.0.0:%d", clientScheme, ptr.Deref(etcd.Spec.Etcd.ClientPort, common.DefaultPortEtcdClient)),
+		AdvertisePeerUrls:            getAdvertiseURLs(etcd, advertiseURLTypePeer, peerScheme, peerSvcName),
+		AdvertiseClientUrls:          getAdvertiseURLs(etcd, advertiseURLTypeClient, clientScheme, peerSvcName),
+		NextClusterVersionCompatible: true,
 	}
 	cfg.PeerSecurity = peerSecurityConfig
 	cfg.ClientSecurity = clientSecurityConfig