feat: rename zk discovery from ZookeeperDiscoveryZNode to `Zookeepe…

…rConfigMapName` (#60) * feat: rename zookeeper discovery field from `ZookeeperDiscoveryZNode` to `ZookeeperConfigMapName` * feat: update bundle and catalog for renaming
zncdatadev · Jul 18, 2024 · f860d59 · f860d59
1 parent 2362094
commit f860d59
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 68 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/bundle/manifests/hdfs-operator.clusterserviceversion.yaml b/bundle/manifests/hdfs-operator.clusterserviceversion.yaml
@@ -19,7 +19,7 @@ metadata:
           },
           "spec": {
             "clusterConfig": {
-              "zookeeperDiscoveryZNode": "sample-hdfs"
+              "zookeeperConfigMapName": "sample-hdfs"
             },
             "dataNode": {
               "roleGroups": {
@@ -133,8 +133,8 @@ metadata:
       ]
     capabilities: Basic Install
     categories: Big Data
-    createdAt: "2024-07-13T10:16:44Z"
-    operators.operatorframework.io/builder: operator-sdk-v1.35.0
+    createdAt: "2024-07-18T07:36:46Z"
+    operators.operatorframework.io/builder: operator-sdk-v1.33.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
   name: hdfs-operator.v0.0.1
   namespace: placeholder

diff --git a/bundle/manifests/hdfs.zncdata.dev_hdfsclusters.yaml b/bundle/manifests/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/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -6,7 +6,7 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: hdfs-operator
   operators.operatorframework.io.bundle.channels.v1: stable
   operators.operatorframework.io.bundle.channel.default.v1: stable
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.35.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4
 

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/deploy/cluster.yaml b/deploy/cluster.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
@@ -10,8 +10,8 @@ import (
 
 type DataNodeContainerBuilder struct {
 	common.ContainerBuilder
-	zookeeperDiscoveryZNode string
-	clusterConfig           *hdfsv1alpha1.ClusterConfigSpec
+	zookeeperConfigMapName string
+	clusterConfig          *hdfsv1alpha1.ClusterConfigSpec
 }
 
 func NewDataNodeContainerBuilder(
@@ -23,9 +23,9 @@ func NewDataNodeContainerBuilder(
 	imagePullPolicy := imageSpec.PullPolicy
 	clusterConfig := instance.Spec.ClusterConfigSpec
 	return &DataNodeContainerBuilder{
-		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfig.ZookeeperDiscoveryZNode,
-		clusterConfig:           clusterConfig,
+		ContainerBuilder:       *common.NewContainerBuilder(image, imagePullPolicy, resource),
+		zookeeperConfigMapName: clusterConfig.ZookeeperConfigMapName,
+		clusterConfig:          clusterConfig,
 	}
 }
 

diff --git a/internal/controller/data/container/init_container.go b/internal/controller/data/container/init_container.go
@@ -12,11 +12,11 @@ import (
 
 type WaitNameNodeContainerBuilder struct {
 	common.ContainerBuilder
-	zookeeperDiscoveryZNode string
-	instanceName            string
-	groupName               string
-	namespace               string
-	clusterConfig           *hdfsv1alpha1.ClusterConfigSpec
+	zookeeperConfigMapName string
+	instanceName           string
+	groupName              string
+	namespace              string
+	clusterConfig          *hdfsv1alpha1.ClusterConfigSpec
 }
 
 func NewWaitNameNodeContainerBuilder(
@@ -28,12 +28,12 @@ func NewWaitNameNodeContainerBuilder(
 	clusterConfigSpec := instance.Spec.ClusterConfigSpec
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 	return &WaitNameNodeContainerBuilder{
-		ContainerBuilder:        *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfigSpec.ZookeeperDiscoveryZNode,
-		instanceName:            instance.Name,
-		groupName:               groupName,
-		namespace:               instance.Namespace,
-		clusterConfig:           clusterConfigSpec,
+		ContainerBuilder:       *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
+		zookeeperConfigMapName: clusterConfigSpec.ZookeeperConfigMapName,
+		instanceName:           instance.Name,
+		groupName:              groupName,
+		namespace:              instance.Namespace,
+		clusterConfig:          clusterConfigSpec,
 	}
 }
 

diff --git a/internal/controller/journal/container.go b/internal/controller/journal/container.go
@@ -10,8 +10,8 @@ import (
 
 type ContainerBuilder struct {
 	common.ContainerBuilder
-	zookeeperDiscoveryZNode string
-	clusterConfig           *hdfsv1alpha1.ClusterConfigSpec
+	zookeeperConfigMapName string
+	clusterConfig          *hdfsv1alpha1.ClusterConfigSpec
 }
 
 func NewJournalNodeContainerBuilder(
@@ -23,9 +23,9 @@ func NewJournalNodeContainerBuilder(
 	imagePullPolicy := imageSpec.PullPolicy
 	clusterConfig := instance.Spec.ClusterConfigSpec
 	return &ContainerBuilder{
-		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfig.ZookeeperDiscoveryZNode,
-		clusterConfig:           clusterConfig,
+		ContainerBuilder:       *common.NewContainerBuilder(image, imagePullPolicy, resource),
+		zookeeperConfigMapName: clusterConfig.ZookeeperConfigMapName,
+		clusterConfig:          clusterConfig,
 	}
 }
 

diff --git a/internal/controller/name/container/format_namenode.go b/internal/controller/name/container/format_namenode.go
@@ -14,12 +14,12 @@ import (
 // FormatNameNodeContainerBuilder container builder
 type FormatNameNodeContainerBuilder struct {
 	common.ContainerBuilder
-	zookeeperDiscoveryZNode string
-	nameNodeReplicates      int32
-	statefulSetName         string
-	instanceName            string
-	namespace               string
-	clusterConfig           *hdfsv1alpha1.ClusterConfigSpec
+	zookeeperConfigMapName string
+	nameNodeReplicates     int32
+	statefulSetName        string
+	instanceName           string
+	namespace              string
+	clusterConfig          *hdfsv1alpha1.ClusterConfigSpec
 }
 
 func NewFormatNameNodeContainerBuilder(
@@ -32,13 +32,13 @@ func NewFormatNameNodeContainerBuilder(
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 	clusterConfig := instance.Spec.ClusterConfigSpec
 	return &FormatNameNodeContainerBuilder{
-		ContainerBuilder:        *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
-		zookeeperDiscoveryZNode: clusterConfig.ZookeeperDiscoveryZNode,
-		nameNodeReplicates:      nameNodeReplicates,
-		statefulSetName:         statefulSetName,
-		instanceName:            instance.Name,
-		namespace:               instance.Namespace,
-		clusterConfig:           clusterConfig,
+		ContainerBuilder:       *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
+		zookeeperConfigMapName: clusterConfig.ZookeeperConfigMapName,
+		nameNodeReplicates:     nameNodeReplicates,
+		statefulSetName:        statefulSetName,
+		instanceName:           instance.Name,
+		namespace:              instance.Namespace,
+		clusterConfig:          clusterConfig,
 	}
 }
 

diff --git a/internal/controller/name/container/format_zk.go b/internal/controller/name/container/format_zk.go
@@ -10,24 +10,24 @@ import (
 // FormatZookeeperContainerBuilder container builder
 type FormatZookeeperContainerBuilder struct {
 	common.ContainerBuilder
-	zookeeperDiscoveryZNode string
-	namespace               string
-	clusterConfig           *hdfsv1alpha1.ClusterConfigSpec
+	zookeeperConfigMapName string
+	namespace              string
+	clusterConfig          *hdfsv1alpha1.ClusterConfigSpec
 }
 
 func NewFormatZookeeperContainerBuilder(
 	instance *hdfsv1alpha1.HdfsCluster,
 	resource corev1.ResourceRequirements,
-	zookeeperDiscoveryZNode string,
+	zookeeperConfigMapName string,
 ) *FormatZookeeperContainerBuilder {
 	imageSpec := instance.Spec.Image
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 
 	return &FormatZookeeperContainerBuilder{
-		ContainerBuilder:        *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
-		zookeeperDiscoveryZNode: zookeeperDiscoveryZNode,
-		namespace:               instance.Namespace,
-		clusterConfig:           instance.Spec.ClusterConfigSpec,
+		ContainerBuilder:       *common.NewContainerBuilder(image, imageSpec.PullPolicy, resource),
+		zookeeperConfigMapName: zookeeperConfigMapName,
+		namespace:              instance.Namespace,
+		clusterConfig:          instance.Spec.ClusterConfigSpec,
 	}
 }
 

diff --git a/internal/controller/name/container/namenode.go b/internal/controller/name/container/namenode.go
@@ -10,8 +10,8 @@ import (
 
 type NameNodeContainerBuilder struct {
 	common.ContainerBuilder
-	zookeeperDiscoveryZNode string
-	clusterConfig           *hdfsv1alpha1.ClusterConfigSpec
+	zookeeperConfigMapName string
+	clusterConfig          *hdfsv1alpha1.ClusterConfigSpec
 }
 
 func NewNameNodeContainerBuilder(
@@ -20,11 +20,11 @@ func NewNameNodeContainerBuilder(
 	imageSpec := instance.Spec.Image
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 	imagePullPolicy := imageSpec.PullPolicy
-	zookeeperDiscoveryZNode := instance.Spec.ClusterConfigSpec.ZookeeperDiscoveryZNode
+	zookeeperConfigMapName := instance.Spec.ClusterConfigSpec.ZookeeperConfigMapName
 	return &NameNodeContainerBuilder{
-		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
-		zookeeperDiscoveryZNode: zookeeperDiscoveryZNode,
-		clusterConfig:           instance.Spec.ClusterConfigSpec,
+		ContainerBuilder:       *common.NewContainerBuilder(image, imagePullPolicy, resource),
+		zookeeperConfigMapName: zookeeperConfigMapName,
+		clusterConfig:          instance.Spec.ClusterConfigSpec,
 	}
 }
 

diff --git a/internal/controller/name/container/zkfc.go b/internal/controller/name/container/zkfc.go
@@ -10,8 +10,8 @@ import (
 // zkfc container builder
 type ZkfcContainerBuilder struct {
 	common.ContainerBuilder
-	zookeeperDiscoveryZNode string
-	clusterConfig           *hdfsv1alpha1.ClusterConfigSpec
+	zookeeperConfigMapName string
+	clusterConfig          *hdfsv1alpha1.ClusterConfigSpec
 }
 
 func NewZkfcContainerBuilder(
@@ -22,11 +22,11 @@ func NewZkfcContainerBuilder(
 	image := util.ImageRepository(imageSpec.Repository, imageSpec.Tag)
 	imagePullPolicy := imageSpec.PullPolicy
 	clusterConfig := instance.Spec.ClusterConfigSpec
-	zookeeperDiscoveryZNode := clusterConfig.ZookeeperDiscoveryZNode
+	zookeeperConfigMapName := clusterConfig.ZookeeperConfigMapName
 	return &ZkfcContainerBuilder{
-		ContainerBuilder:        *common.NewContainerBuilder(image, imagePullPolicy, resource),
-		zookeeperDiscoveryZNode: zookeeperDiscoveryZNode,
-		clusterConfig:           clusterConfig,
+		ContainerBuilder:       *common.NewContainerBuilder(image, imagePullPolicy, resource),
+		zookeeperConfigMapName: zookeeperConfigMapName,
+		clusterConfig:          clusterConfig,
 	}
 }
 

diff --git a/internal/controller/name/statefulset.go b/internal/controller/name/statefulset.go
@@ -154,7 +154,7 @@ func (s *StatefulSetReconciler) makeFormatZookeeperContainer() corev1.Container
 	formatZookeeper := container.NewFormatZookeeperContainerBuilder(
 		s.Instance,
 		*common.ConvertToResourceRequirements(s.MergedCfg.Config.Resources),
-		s.getZookeeperDiscoveryZNode(),
+		s.getZookeeperConfigMapName(),
 	)
 	return formatZookeeper.Build(formatZookeeper)
 }
@@ -275,6 +275,6 @@ func (s *StatefulSetReconciler) getNameNodeConfigMapSource() *corev1.ConfigMapVo
 }
 
 // get zookeeper discovery znode
-func (s *StatefulSetReconciler) getZookeeperDiscoveryZNode() string {
-	return s.Instance.Spec.ClusterConfigSpec.ZookeeperDiscoveryZNode
+func (s *StatefulSetReconciler) getZookeeperConfigMapName() string {
+	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: