feat: rename zookeeper discovery field from ZookeeperDiscoveryZNode…

… to `ZookeeperConfigMapName`
lwpk110 · Jul 18, 2024 · 924fad5 · 924fad5
1 parent 2362094
commit 924fad5
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/api/v1alpha1/hdfscluster_types.go b/api/v1alpha1/hdfscluster_types.go
@@ -195,7 +195,7 @@ type ClusterConfigSpec struct {
 	DfsReplication int32 `json:"dfsReplication,omitempty"`
 
 	// +kubebuilder:validation:required
-	ZookeeperDiscoveryZNode string `json:"zookeeperDiscoveryZNode,omitempty"`
+	ZookeeperConfigMapName string `json:"zookeeperConfigMapName,omitempty"`
 }
 
 type AuthenticationSpec struct {

diff --git a/config/crd/bases/hdfs.zncdata.dev_hdfsclusters.yaml b/config/crd/bases/hdfs.zncdata.dev_hdfsclusters.yaml
@@ -86,7 +86,7 @@ spec:
                           for a service
                         type: string
                     type: object
-                  zookeeperDiscoveryZNode:
+                  zookeeperConfigMapName:
                     type: string
                 type: object
               dataNode:

diff --git a/config/samples/hdfs_v1alpha1_hdfscluster.yaml b/config/samples/hdfs_v1alpha1_hdfscluster.yaml
@@ -13,7 +13,7 @@ spec:
     repository: docker.stackable.tech/stackable/hadoop
     tag: 3.3.4-stackable24.3.0
   clusterConfig:
-    zookeeperDiscoveryZNode: sample-hdfs
+    zookeeperConfigMapName: sample-hdfs
   nameNode:
     roleGroups:
       default:

diff --git a/internal/common/util.go b/internal/common/util.go
@@ -214,7 +214,7 @@ func GetCommonContainerEnv(clusterConfig *hdfsv1alpha1.ClusterConfigSpec, contai
 			ValueFrom: &corev1.EnvVarSource{
 				ConfigMapKeyRef: &corev1.ConfigMapKeySelector{
 					LocalObjectReference: corev1.LocalObjectReference{
-						Name: clusterConfig.ZookeeperDiscoveryZNode,
+						Name: clusterConfig.ZookeeperConfigMapName,
 					},
 					Key: ZookeeperHdfsDiscoveryKey,
 				},

diff --git a/internal/controller/data/container/datanode.go b/internal/controller/data/container/datanode.go
@@ -24,7 +24,7 @@ func NewDataNodeContainerBuilder(
 	clusterConfig := instance.Spec.ClusterConfigSpec
 	return &DataNodeContainerBuilder{
 		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfig.ZookeeperDiscoveryZNode,
+		zookeeperDiscoveryZNode: clusterConfig.ZookeeperConfigMapName,
 		clusterConfig:           clusterConfig,
 	}
 }

diff --git a/internal/controller/data/container/init_container.go b/internal/controller/data/container/init_container.go
@@ -29,7 +29,7 @@ func NewWaitNameNodeContainerBuilder(
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 	return &WaitNameNodeContainerBuilder{
 		ContainerBuilder:        *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfigSpec.ZookeeperDiscoveryZNode,
+		zookeeperDiscoveryZNode: clusterConfigSpec.ZookeeperConfigMapName,
 		instanceName:            instance.Name,
 		groupName:               groupName,
 		namespace:               instance.Namespace,

diff --git a/internal/controller/journal/container.go b/internal/controller/journal/container.go
@@ -24,7 +24,7 @@ func NewJournalNodeContainerBuilder(
 	clusterConfig := instance.Spec.ClusterConfigSpec
 	return &ContainerBuilder{
 		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfig.ZookeeperDiscoveryZNode,
+		zookeeperDiscoveryZNode: clusterConfig.ZookeeperConfigMapName,
 		clusterConfig:           clusterConfig,
 	}
 }

diff --git a/internal/controller/name/container/format_namenode.go b/internal/controller/name/container/format_namenode.go
@@ -33,7 +33,7 @@ func NewFormatNameNodeContainerBuilder(
 	clusterConfig := instance.Spec.ClusterConfigSpec
 	return &FormatNameNodeContainerBuilder{
 		ContainerBuilder:        *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfig.ZookeeperDiscoveryZNode,
+		zookeeperDiscoveryZNode: clusterConfig.ZookeeperConfigMapName,
 		nameNodeReplicates:      nameNodeReplicates,
 		statefulSetName:         statefulSetName,
 		instanceName:            instance.Name,

diff --git a/internal/controller/name/container/namenode.go b/internal/controller/name/container/namenode.go
@@ -20,7 +20,7 @@ func NewNameNodeContainerBuilder(
 	imageSpec := instance.Spec.Image
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 	imagePullPolicy := imageSpec.PullPolicy
-	zookeeperDiscoveryZNode := instance.Spec.ClusterConfigSpec.ZookeeperDiscoveryZNode
+	zookeeperDiscoveryZNode := instance.Spec.ClusterConfigSpec.ZookeeperConfigMapName
 	return &NameNodeContainerBuilder{
 		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
 		zookeeperDiscoveryZNode: zookeeperDiscoveryZNode,

diff --git a/internal/controller/name/container/zkfc.go b/internal/controller/name/container/zkfc.go
@@ -22,7 +22,7 @@ func NewZkfcContainerBuilder(
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 	imagePullPolicy := imageSpec.PullPolicy
 	clusterConfig := instance.Spec.ClusterConfigSpec
-	zookeeperDiscoveryZNode := clusterConfig.ZookeeperDiscoveryZNode
+	zookeeperDiscoveryZNode := clusterConfig.ZookeeperConfigMapName
 	return &ZkfcContainerBuilder{
 		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
 		zookeeperDiscoveryZNode: zookeeperDiscoveryZNode,

diff --git a/internal/controller/name/statefulset.go b/internal/controller/name/statefulset.go
@@ -276,5 +276,5 @@ func (s *StatefulSetReconciler) getNameNodeConfigMapSource() *corev1.ConfigMapVo
 
 // get zookeeper discovery znode
 func (s *StatefulSetReconciler) getZookeeperDiscoveryZNode() string {
-	return s.Instance.Spec.ClusterConfigSpec.ZookeeperDiscoveryZNode
+	return s.Instance.Spec.ClusterConfigSpec.ZookeeperConfigMapName
 }
diff --git a/test/e2e/default/04-hdfs.yaml b/test/e2e/default/04-hdfs.yaml
@@ -14,7 +14,7 @@ spec:
     repository: quay.io/zncdatadev/hadoop
     tag: 3.3.4
   clusterConfig:
-    zookeeperDiscoveryZNode: sample-hdfs-znode
+    zookeeperConfigMapName: sample-hdfs-znode
   nameNode:
     roleGroups:
       default: