fix: update default value for listener-class

lwpk110 · Jul 18, 2024 · de4e0da · de4e0da
1 parent 2362094
commit de4e0da
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 97 deletions.
diff --git a/api/v1alpha1/datanode.go b/api/v1alpha1/datanode.go
@@ -25,7 +25,7 @@ type DataNodeConfigSpec struct {
 	Resources *ResourcesSpec `json:"resources,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:="cluster-internal"
+	// +kubebuilder:default:="external-unstable"
 	ListenerClass string `json:"listenerClass,omitempty"`
 
 	// +kubebuilder:validation:Optional

diff --git a/api/v1alpha1/namenode.go b/api/v1alpha1/namenode.go
@@ -25,7 +25,7 @@ type NameNodeConfigSpec struct {
 	Resources *ResourcesSpec `json:"resources,omitempty"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:="cluster-internal"
+	// +kubebuilder:default:="external-stable"
 	ListenerClass string `json:"listenerClass,omitempty"`
 
 	// +kubebuilder:validation:Optional
@@ -62,7 +62,7 @@ type NameNodeConfigSpec struct {
 type NameNodeContainerLoggingSpec struct {
 	// +kubebuilder:validation:Optional
 	NameNode *LoggingConfigSpec `json:"namenode,omitempty"`
-	// +kubebuilder:validation:Optional
+	// +kubebuilder:validation:Optionalnamenode
 	Zkfc *LoggingConfigSpec `json:"zkfc,omitempty"`
 
 	// +kubebuilder:validation:Optional

diff --git a/config/crd/bases/hdfs.zncdata.dev_hdfsclusters.yaml b/config/crd/bases/hdfs.zncdata.dev_hdfsclusters.yaml
@@ -1038,7 +1038,7 @@ spec:
                           type: string
                         type: object
                       listenerClass:
-                        default: cluster-internal
+                        default: external-unstable
                         type: string
                       logging:
                         properties:
@@ -2514,7 +2514,7 @@ spec:
                                 type: string
                               type: object
                             listenerClass:
-                              default: cluster-internal
+                              default: external-unstable
                               type: string
                             logging:
                               properties:
@@ -6766,7 +6766,7 @@ spec:
                           type: string
                         type: object
                       listenerClass:
-                        default: cluster-internal
+                        default: external-stable
                         type: string
                       logging:
                         properties:
@@ -8408,7 +8408,7 @@ spec:
                                 type: string
                               type: object
                             listenerClass:
-                              default: cluster-internal
+                              default: external-stable
                               type: string
                             logging:
                               properties:

diff --git a/go.mod b/go.mod
@@ -8,7 +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-20240521093857-96c738598120
+	github.com/zncdatadev/listener-operator v0.0.0-20240718111709-11519a396dfb
 	github.com/zncdatadev/operator-go v0.7.0
 	github.com/zncdatadev/secret-operator v0.0.0-20240702125144-ea71dfd42d9f
 	k8s.io/api v0.30.2
@@ -19,16 +19,16 @@ require (
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/emicklei/go-restful/v3 v3.12.0 // indirect
 	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -38,41 +38,39 @@ require (
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/prometheus/client_golang v1.18.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.45.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/client_golang v1.19.1 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.53.0 // indirect
+	github.com/prometheus/procfs v0.15.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/oauth2 v0.20.0 // indirect
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/term v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.21.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.30.1 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/kube-openapi v0.0.0-20240521025948-451ce29f5b89 // indirect
 	k8s.io/kubectl v0.30.1 // indirect
-	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // 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
 	sigs.k8s.io/yaml v1.4.0 // indirect