feat: rm zookeeper configuration in discovery core-site.xml (zncdatad…

…ev#69)
lwpk110 · Jul 26, 2024 · ed71a0c · ed71a0c
1 parent dd18a16
commit ed71a0c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/internal/common/hdfs_conf.go b/internal/common/hdfs_conf.go
@@ -17,15 +17,13 @@ const coreSiteTemplate = `<?xml version="1.0"?>
     <name>fs.defaultFS</name>
     <value>hdfs://%s/</value>
   </property>
-  <property>
-    <name>ha.zookeeper.quorum</name>
-    <value>${env.ZOOKEEPER}</value>
-  </property>
 </configuration>`
 
 type CoreSiteXmlGenerator struct {
 	InstanceName string
 
+	IsDiscovery bool
+
 	properties []util.XmlNameValuePair
 }
 
@@ -37,13 +35,19 @@ func (c *CoreSiteXmlGenerator) Generate() string {
 	return xml
 }
 
+func (c *CoreSiteXmlGenerator) HaZookeeperQuorum() *CoreSiteXmlGenerator {
+	c.properties = append(c.properties, util.XmlNameValuePair{
+		Name:  "ha.zookeeper.quorum",
+		Value: "${env.ZOOKEEPER}",
+	})
+	return c
+}
+
 // EnableKerberos Enable kerberos
 func (c *CoreSiteXmlGenerator) EnableKerberos(
-	clusterConfig *hdfsv1alpha1.ClusterConfigSpec,
-	ns string,
-	isDiscovery bool) *CoreSiteXmlGenerator {
+	clusterConfig *hdfsv1alpha1.ClusterConfigSpec, ns string) *CoreSiteXmlGenerator {
 	if IsKerberosEnabled(clusterConfig) {
-		if isDiscovery {
+		if c.IsDiscovery {
 			c.properties = append(c.properties, SecurityDiscoveryCoreSiteXml(c.InstanceName, ns)...)
 		} else {
 			c.properties = append(c.properties, SecurityCoreSiteXml(c.InstanceName, ns)...)

diff --git a/internal/controller/data/configmap.go b/internal/controller/data/configmap.go
@@ -77,7 +77,7 @@ func (c *ConfigMapReconciler) Build(_ context.Context) (client.Object, error) {
 // make core-site.xml data
 func (c *ConfigMapReconciler) makeCoreSiteData() string {
 	generator := &common.CoreSiteXmlGenerator{InstanceName: c.Instance.GetName()}
-	return generator.EnableKerberos(c.Instance.Spec.ClusterConfigSpec, c.Instance.Namespace, false).Generate()
+	return generator.EnableKerberos(c.Instance.Spec.ClusterConfigSpec, c.Instance.Namespace).HaZookeeperQuorum().Generate()
 }
 
 // make hdfs-site.xml data

diff --git a/internal/controller/discovery.go b/internal/controller/discovery.go
@@ -63,8 +63,8 @@ func (d *Discovery) Build(ctx context.Context) (client.Object, error) {
 }
 
 func (d *Discovery) makeCoreSiteXmlData() string {
-	generator := common.CoreSiteXmlGenerator{InstanceName: d.Instance.Name}
-	return generator.EnableKerberos(d.Instance.Spec.ClusterConfigSpec, d.Instance.Namespace, true).Generate()
+	generator := common.CoreSiteXmlGenerator{InstanceName: d.Instance.Name, IsDiscovery: true}
+	return generator.EnableKerberos(d.Instance.Spec.ClusterConfigSpec, d.Instance.Namespace).Generate()
 }
 
 func (d *Discovery) makeHdfsSiteXmlData(ctx context.Context) (string, error) {

diff --git a/internal/controller/journal/configmap.go b/internal/controller/journal/configmap.go
@@ -76,7 +76,7 @@ func (c *ConfigMapReconciler) Build(_ context.Context) (client.Object, error) {
 // make core-site.xml data
 func (c *ConfigMapReconciler) makeCoreSiteData() string {
 	generator := &common.CoreSiteXmlGenerator{InstanceName: c.Instance.GetName()}
-	return generator.EnableKerberos(c.Instance.Spec.ClusterConfigSpec, c.Instance.Namespace, false).Generate()
+	return generator.EnableKerberos(c.Instance.Spec.ClusterConfigSpec, c.Instance.Namespace).HaZookeeperQuorum().Generate()
 }
 
 // make hdfs-site.xml data

diff --git a/internal/controller/name/configmap.go b/internal/controller/name/configmap.go
@@ -82,7 +82,7 @@ func (c *ConfigMapReconciler) Build(_ context.Context) (client.Object, error) {
 // make core-site.xml data
 func (c *ConfigMapReconciler) makeCoreSiteData() string {
 	generator := &common.CoreSiteXmlGenerator{InstanceName: c.Instance.GetName()}
-	return generator.EnableKerberos(c.Instance.Spec.ClusterConfigSpec, c.Instance.Namespace, false).Generate()
+	return generator.EnableKerberos(c.Instance.Spec.ClusterConfigSpec, c.Instance.Namespace).HaZookeeperQuorum().Generate()
 }
 
 // make hdfs-site.xml data