feat: adapt listener api types in operator-go

As the kerberos server is not able to run in github e2e test, so remove temporarily
lwpk110 · Jul 25, 2024 · bf74447 · bf74447
1 parent 5c21685
commit bf74447
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 70 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -38,7 +38,7 @@ import (
 
 	hdfsv1alpha1 "github.com/zncdatadev/hdfs-operator/api/v1alpha1"
 	"github.com/zncdatadev/hdfs-operator/internal/controller"
-	listenerv1alpha1 "github.com/zncdatadev/listener-operator/api/v1alpha1"
+	listenerv1alpha1 "github.com/zncdatadev/operator-go/pkg/apis/listeners/v1alpha1"
 	//+kubebuilder:scaffold:imports
 )
 

diff --git a/go.mod b/go.mod
@@ -8,8 +8,7 @@ require (
 	github.com/go-logr/logr v1.4.2
 	github.com/onsi/ginkgo/v2 v2.19.0
 	github.com/onsi/gomega v1.33.1
-	github.com/zncdatadev/listener-operator v0.0.0-20240718111709-11519a396dfb
-	github.com/zncdatadev/operator-go v0.7.0
+	github.com/zncdatadev/operator-go v0.8.3
 	github.com/zncdatadev/secret-operator v0.0.0-20240702125144-ea71dfd42d9f
 	k8s.io/api v0.30.2
 	k8s.io/apimachinery v0.30.2
@@ -69,7 +68,6 @@ require (
 	k8s.io/apiextensions-apiserver v0.30.1 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240521025948-451ce29f5b89 // indirect
-	k8s.io/kubectl v0.30.1 // indirect
 	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

diff --git a/go.sum b/go.sum
@@ -94,10 +94,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zncdatadev/listener-operator v0.0.0-20240718111709-11519a396dfb h1:eRvHKaLNR7czgdPOlqSPOtS+Mwh4Qhvu7bkoFxJAdtk=
-github.com/zncdatadev/listener-operator v0.0.0-20240718111709-11519a396dfb/go.mod h1:Cl9kFzXXdSYgL8q9yh+5AEfIKtcZALeNwZL1LqsvoTA=
-github.com/zncdatadev/operator-go v0.7.0 h1:b/slHv/IkrDC0caGApTaOHqSyHUfXNJsZnpNT6w9AqQ=
-github.com/zncdatadev/operator-go v0.7.0/go.mod h1:JMIBxkTLlryxmdh15OK1UTRfKU9HlDD5OtO+2YTkDfs=
+github.com/zncdatadev/operator-go v0.8.3 h1:OwjvVf9PR+s1BEWW2tCKUuHOV0iVnsr1ReGVbdDNaKo=
+github.com/zncdatadev/operator-go v0.8.3/go.mod h1:wwISwqkAhgyeaJ6OSBji2PB1a3Jsz0Yu0uTabmWxUpM=
 github.com/zncdatadev/secret-operator v0.0.0-20240702125144-ea71dfd42d9f h1:2B0yoV5hC8YOr07j6sKy5SUe/eTmj8On4Q1lt7dtO1o=
 github.com/zncdatadev/secret-operator v0.0.0-20240702125144-ea71dfd42d9f/go.mod h1:U9VDQ1Emgoe2+1vmveEeL86FFgBOtKiKA3GDcYvnLqI=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -175,8 +173,6 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20240521025948-451ce29f5b89 h1:PVDt+zAAka/NPJmeBw9xmTwbMKVVAcB2wYGOHrbWKdA=
 k8s.io/kube-openapi v0.0.0-20240521025948-451ce29f5b89/go.mod h1:PMabYkVfJJ5KPe2D98XW9A3kZYKnxJnBRsKLWIPyFv0=
-k8s.io/kubectl v0.30.1 h1:sHFIRI3oP0FFZmBAVEE8ErjnTyXDPkBcvO88mH9RjuY=
-k8s.io/kubectl v0.30.1/go.mod h1:7j+L0Cc38RYEcx+WH3y44jRBe1Q1jxdGPKkX0h4iDq0=
 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=

diff --git a/internal/common/hdfs_conf.go b/internal/common/hdfs_conf.go
@@ -311,21 +311,15 @@ networkaddress.cache.ttl=30`
 func MakeSslClientData(clusterSpec *hdfsv1alpha1.ClusterConfigSpec) string {
 	if IsTlsEnabled(clusterSpec) {
 		jksPasswd := clusterSpec.Authentication.Tls.JksPassword
-		xmlConfig := []opgoutil.XmlNameValuePair{
-			{
-				Name:  "ssl.client.truststore.location",
-				Value: fmt.Sprintf("%s/truststore.p12", hdfsv1alpha1.TlsMountPath),
-			},
-			{
-				Name:  "ssl.client.truststore.type",
-				Value: "pkcs12",
-			},
-			{
-				Name:  "ssl.client.truststore.password",
-				Value: jksPasswd,
-			},
+		if xml, err := opgoutil.NewXMLConfigurationFromMap(map[string]string{
+			"ssl.client.truststore.location": fmt.Sprintf("%s/truststore.p12", hdfsv1alpha1.TlsMountPath),
+			"ssl.client.truststore.type":     "pkcs12",
+			"ssl.client.truststore.password": jksPasswd,
+		}).Marshal(); err == nil {
+			return xml
+		} else {
+			panic(err)
 		}
-		return opgoutil.NewXmlConfiguration(xmlConfig).String(nil)
 	} else {
 		return `<?xml version="1.0"?>
 <configuration>
@@ -337,33 +331,18 @@ func MakeSslClientData(clusterSpec *hdfsv1alpha1.ClusterConfigSpec) string {
 func MakeSslServerData(clusterSpec *hdfsv1alpha1.ClusterConfigSpec) string {
 	if IsTlsEnabled(clusterSpec) {
 		jksPasswd := clusterSpec.Authentication.Tls.JksPassword
-		xmlConfig := []opgoutil.XmlNameValuePair{
-			{
-				Name:  "ssl.server.truststore.location",
-				Value: fmt.Sprintf("%s/truststore.p12", hdfsv1alpha1.TlsMountPath),
-			},
-			{
-				Name:  "ssl.server.truststore.type",
-				Value: "pkcs12",
-			},
-			{
-				Name:  "ssl.server.truststore.password",
-				Value: jksPasswd,
-			},
-			{
-				Name:  "ssl.server.keystore.location",
-				Value: fmt.Sprintf("%s/keystore.p12", hdfsv1alpha1.TlsMountPath),
-			},
-			{
-				Name:  "ssl.server.keystore.type",
-				Value: "pkcs12",
-			},
-			{
-				Name:  "ssl.server.keystore.password",
-				Value: jksPasswd,
-			},
+		if xml, err := opgoutil.NewXMLConfigurationFromMap(map[string]string{
+			"ssl.server.truststore.location": fmt.Sprintf("%s/truststore.p12", hdfsv1alpha1.TlsMountPath),
+			"ssl.server.truststore.type":     "pkcs12",
+			"ssl.server.truststore.password": jksPasswd,
+			"ssl.server.keystore.location":   fmt.Sprintf("%s/keystore.p12", hdfsv1alpha1.TlsMountPath),
+			"ssl.server.keystore.type":       "pkcs12",
+			"ssl.server.keystore.password":   jksPasswd,
+		}).Marshal(); err == nil {
+			return xml
+		} else {
+			panic(err)
 		}
-		return opgoutil.NewXmlConfiguration(xmlConfig).String(nil)
 	} else {
 		return `<?xml version="1.0"?>
 <configuration>

diff --git a/internal/common/tls.go b/internal/common/tls.go
@@ -75,6 +75,22 @@ func WebUiPortProbe(clusterSpec *hdfsv1alpha1.ClusterConfigSpec) corev1.URISchem
 	}
 }
 
+func TlsHttpGetAction(clusterSpec *hdfsv1alpha1.ClusterConfigSpec, probePath string) *corev1.HTTPGetAction {
+	if IsTlsEnabled(clusterSpec) {
+		return &corev1.HTTPGetAction{
+			Path:   probePath,
+			Port:   intstr.FromString(hdfsv1alpha1.HttpsName),
+			Scheme: corev1.URISchemeHTTPS,
+		}
+	} else {
+		return &corev1.HTTPGetAction{
+			Path:   probePath,
+			Port:   intstr.FromString(hdfsv1alpha1.HttpName),
+			Scheme: corev1.URISchemeHTTP,
+		}
+	}
+}
+
 func TlsVolumeMounts() []corev1.VolumeMount {
 	return []corev1.VolumeMount{
 		{

diff --git a/internal/controller/data/container/datanode.go b/internal/controller/data/container/datanode.go
@@ -73,11 +73,7 @@ func (d *DataNodeContainerBuilder) LivenessProbe() *corev1.Probe {
 		SuccessThreshold:    1,
 		TimeoutSeconds:      1,
 		ProbeHandler: corev1.ProbeHandler{
-			HTTPGet: &corev1.HTTPGetAction{
-				Path:   "/datanode.html",
-				Port:   intstr.FromString(hdfsv1alpha1.HttpName),
-				Scheme: common.WebUiPortProbe(d.clusterConfig),
-			},
+			HTTPGet: common.TlsHttpGetAction(d.clusterConfig, "/datanode.html"),
 		},
 	}
 }

diff --git a/internal/controller/discovery.go b/internal/controller/discovery.go
@@ -9,7 +9,7 @@ import (
 	hdfsv1alpha1 "github.com/zncdatadev/hdfs-operator/api/v1alpha1"
 	"github.com/zncdatadev/hdfs-operator/internal/common"
 	"github.com/zncdatadev/hdfs-operator/internal/util"
-	listenerv1alpha1 "github.com/zncdatadev/listener-operator/api/v1alpha1"
+	listenerv1alpha1 "github.com/zncdatadev/operator-go/pkg/apis/listeners/v1alpha1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -214,9 +214,9 @@ func (d *Discovery) createConnections(ctx context.Context, podNames []string) ([
 
 // get port from address by port name
 func (d *Discovery) getPort(address *listenerv1alpha1.IngressAddressSpec, portName string) (int32, error) {
-	for _, port := range *address.Ports {
-		if port.Name == portName {
-			return port.Port, nil
+	for name, port := range address.Ports {
+		if name == portName {
+			return port, nil
 		}
 	}
 	return 0, errors.Errorf("not found port in address %s by port name", portName)
@@ -244,7 +244,7 @@ func (d *Discovery) getListenerAddress(
 		discoveryLog.Error(err, "failed to get listener", "cacheKey", cacheKey)
 		return nil, err
 	}
-	address := &listener.Status.IngressAddress[0]
+	address := &listener.Status.IngressAddresses[0]
 	cacheObj[cacheKey] = address
 	return address, nil
 }
diff --git a/internal/controller/journal/container.go b/internal/controller/journal/container.go
@@ -69,11 +69,7 @@ func (d *ContainerBuilder) LivenessProbe() *corev1.Probe {
 		SuccessThreshold:    1,
 		TimeoutSeconds:      1,
 		ProbeHandler: corev1.ProbeHandler{
-			HTTPGet: &corev1.HTTPGetAction{
-				Path:   "/journalnode.html",
-				Port:   intstr.FromString(hdfsv1alpha1.HttpName),
-				Scheme: common.WebUiPortProbe(d.clusterConfig),
-			},
+			HTTPGet: common.TlsHttpGetAction(d.clusterConfig, "/journalnode.html"),
 		},
 	}
 }

diff --git a/internal/controller/name/container/namenode.go b/internal/controller/name/container/namenode.go
@@ -72,11 +72,7 @@ func (n *NameNodeContainerBuilder) LivenessProbe() *corev1.Probe {
 		SuccessThreshold:    1,
 		TimeoutSeconds:      1,
 		ProbeHandler: corev1.ProbeHandler{
-			HTTPGet: &corev1.HTTPGetAction{
-				Path:   "/dfshealth.html",
-				Port:   intstr.FromString(hdfsv1alpha1.HttpName),
-				Scheme: common.WebUiPortProbe(n.clusterConfig),
-			},
+			HTTPGet: common.TlsHttpGetAction(n.clusterConfig, "dfshealth.html"),
 		},
 	}
 }