This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 03f3ef66 [operator] Repair completed docked (#619)
03f3ef66 is described below
commit 03f3ef66680fb6c42211a7fea58a35fd7a79d5ee
Author: Jian Zhong <[email protected]>
AuthorDate: Thu Feb 20 22:14:48 2025 +0800
[operator] Repair completed docked (#619)
---
.../nacos/templates/configmap.yaml | 6 +-
.../nacos/templates/service.yaml | 4 +-
.../nacos/templates/statefulset.yaml | 4 +-
.../nacos/templates/zzz_profile.yaml | 1 +
.../register-discovery/nacos/values.yaml | 4 +-
operator/pkg/apis/proto/values_types.proto | 20 ++
operator/pkg/apis/values_types.pb.go | 319 ++++++++++++++++++---
operator/pkg/component/component.go | 1 -
8 files changed, 313 insertions(+), 46 deletions(-)
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
index fc076779..7d7b377d 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/configmap.yaml
@@ -1,5 +1,5 @@
-{{- $nacos := .Values.nacos -}}
-{{- if $nacos.storage.type "mysql" }}
+{{- $nacos := .Values -}}
+{{/*{{- if $nacos.storage.type "mysql" }}*/}}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -22,5 +22,5 @@ data:
mysql.user: {{ .db.username }}
mysql.password: {{ .db.password }}
mysql.param: {{ .db.param | default
"characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false"
}}
-{{- end -}}
+{{/*{{- end -}}*/}}
{{- end -}}
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
index 1acac955..e5857175 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- $nacos := .Values.nacos -}}
+{{- $nacos := .Values -}}
{{- $service := $nacos.service -}}
apiVersion: v1
kind: Service
@@ -54,7 +54,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "nacos.name" . }}-headless
- namespace: {{ template "nacos.namespace" . }}
+ namespace: {{ .Release.Namespace }}
labels:
{{- include "nacos.labels" . | nindent 4 }}
{{- with .Values.labels }}
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
index d9e01e16..2c22a826 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/statefulset.yaml
@@ -79,10 +79,10 @@ spec:
value: {{ $nacos.serverPort | quote }}
- name: PREFER_HOST_MODE
value: {{ $nacos.preferhostmode | quote }}
- {{- if eq $nacos.mode "standalone" }}
+ {{- if eq $nacos.nacos.mode "standalone" }}
- name: MODE
value: "standalone"
- {{- else if eq $nacos.mode "cluster" }}
+ {{- else if eq $nacos.nacos.mode "cluster" }}
- name: SERVICE_NAME
value: "{{ template "nacos.name" . }}-headless"
- name: DOMAIN_NAME
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
index 32c3348c..e5d51a9e 100644
---
a/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/nacos/templates/zzz_profile.yaml
@@ -3,6 +3,7 @@
"`--set defaults.foo=bar` with `--set foo=bar`. Defaults set:\n"
($.Values.defaults | toYaml |nindent 4) ) }}
{{- end }}
+
{{- $defaults := $.Values._internal_default_values_not_set }}
{{- $_ := unset $.Values "_internal_default_values_not_set " }}
{{- $profile := dict }}
diff --git
a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
index 6792fbb9..9769b3aa 100644
--- a/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
+++ b/manifests/charts/dubbo-control/register-discovery/nacos/values.yaml
@@ -42,9 +42,9 @@ _internal_default_values_not_set:
## Configure the application image
image:
# Source of the container image.
- registry: docker.io/nacos/nacos-server
+ registry: nacos/nacos-server
# Version tag of the container image.
- tag: v2.2.3
+ tag: latest
# Image pull policy, available options are: Always, IfNotPresent, Never.
pullPolicy: IfNotPresent
securityContext:
diff --git a/operator/pkg/apis/proto/values_types.proto
b/operator/pkg/apis/proto/values_types.proto
index 87d79d59..932ecaf6 100644
--- a/operator/pkg/apis/proto/values_types.proto
+++ b/operator/pkg/apis/proto/values_types.proto
@@ -17,6 +17,22 @@ message BaseConfig {
google.protobuf.BoolValue enableDubboConfigCRDs = 1;
}
+message ZookeeperConfig {
+ google.protobuf.StringValue dataLogDir = 1;
+ google.protobuf.Int64Value tickTime = 2;
+ google.protobuf.Int64Value initLimit = 3;
+ google.protobuf.Int64Value syncLimit = 4;
+ google.protobuf.Int64Value preAllocSize = 5;
+ google.protobuf.Int64Value snapCount = 6;
+ google.protobuf.StringValue fourlwCommandsWhitelist = 7;
+ google.protobuf.BoolValue listenOnAllIPs = 8;
+}
+
+message NacosConfig {
+ string mode = 1;
+}
+
+
message Values {
// Global configuration for dubbo components.
GlobalConfig global = 1;
@@ -26,6 +42,10 @@ message Values {
// Specifies which installation configuration profile to apply.
string profile = 3;
+
+ ZookeeperConfig zookeeper = 4;
+
+ NacosConfig nacos = 5;
}
// IntOrString is a type that can hold an int32 or a string. When used in
diff --git a/operator/pkg/apis/values_types.pb.go
b/operator/pkg/apis/values_types.pb.go
index 3c3c1bc1..fc2edd98 100644
--- a/operator/pkg/apis/values_types.pb.go
+++ b/operator/pkg/apis/values_types.pb.go
@@ -118,6 +118,156 @@ func (x *BaseConfig) GetEnableDubboConfigCRDs()
*wrapperspb.BoolValue {
return nil
}
+type ZookeeperConfig struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ DataLogDir *wrapperspb.StringValue
`protobuf:"bytes,1,opt,name=dataLogDir,proto3" json:"dataLogDir,omitempty"`
+ TickTime *wrapperspb.Int64Value
`protobuf:"bytes,2,opt,name=tickTime,proto3" json:"tickTime,omitempty"`
+ InitLimit *wrapperspb.Int64Value
`protobuf:"bytes,3,opt,name=initLimit,proto3" json:"initLimit,omitempty"`
+ SyncLimit *wrapperspb.Int64Value
`protobuf:"bytes,4,opt,name=syncLimit,proto3" json:"syncLimit,omitempty"`
+ PreAllocSize *wrapperspb.Int64Value
`protobuf:"bytes,5,opt,name=preAllocSize,proto3" json:"preAllocSize,omitempty"`
+ SnapCount *wrapperspb.Int64Value
`protobuf:"bytes,6,opt,name=snapCount,proto3" json:"snapCount,omitempty"`
+ FourlwCommandsWhitelist *wrapperspb.StringValue
`protobuf:"bytes,7,opt,name=fourlwCommandsWhitelist,proto3"
json:"fourlwCommandsWhitelist,omitempty"`
+ ListenOnAllIPs *wrapperspb.BoolValue
`protobuf:"bytes,8,opt,name=listenOnAllIPs,proto3"
json:"listenOnAllIPs,omitempty"`
+}
+
+func (x *ZookeeperConfig) Reset() {
+ *x = ZookeeperConfig{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_values_types_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ZookeeperConfig) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ZookeeperConfig) ProtoMessage() {}
+
+func (x *ZookeeperConfig) ProtoReflect() protoreflect.Message {
+ mi := &file_values_types_proto_msgTypes[2]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ZookeeperConfig.ProtoReflect.Descriptor instead.
+func (*ZookeeperConfig) Descriptor() ([]byte, []int) {
+ return file_values_types_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *ZookeeperConfig) GetDataLogDir() *wrapperspb.StringValue {
+ if x != nil {
+ return x.DataLogDir
+ }
+ return nil
+}
+
+func (x *ZookeeperConfig) GetTickTime() *wrapperspb.Int64Value {
+ if x != nil {
+ return x.TickTime
+ }
+ return nil
+}
+
+func (x *ZookeeperConfig) GetInitLimit() *wrapperspb.Int64Value {
+ if x != nil {
+ return x.InitLimit
+ }
+ return nil
+}
+
+func (x *ZookeeperConfig) GetSyncLimit() *wrapperspb.Int64Value {
+ if x != nil {
+ return x.SyncLimit
+ }
+ return nil
+}
+
+func (x *ZookeeperConfig) GetPreAllocSize() *wrapperspb.Int64Value {
+ if x != nil {
+ return x.PreAllocSize
+ }
+ return nil
+}
+
+func (x *ZookeeperConfig) GetSnapCount() *wrapperspb.Int64Value {
+ if x != nil {
+ return x.SnapCount
+ }
+ return nil
+}
+
+func (x *ZookeeperConfig) GetFourlwCommandsWhitelist() *wrapperspb.StringValue
{
+ if x != nil {
+ return x.FourlwCommandsWhitelist
+ }
+ return nil
+}
+
+func (x *ZookeeperConfig) GetListenOnAllIPs() *wrapperspb.BoolValue {
+ if x != nil {
+ return x.ListenOnAllIPs
+ }
+ return nil
+}
+
+type NacosConfig struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Mode string `protobuf:"bytes,1,opt,name=mode,proto3"
json:"mode,omitempty"`
+}
+
+func (x *NacosConfig) Reset() {
+ *x = NacosConfig{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_values_types_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *NacosConfig) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NacosConfig) ProtoMessage() {}
+
+func (x *NacosConfig) ProtoReflect() protoreflect.Message {
+ mi := &file_values_types_proto_msgTypes[3]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use NacosConfig.ProtoReflect.Descriptor instead.
+func (*NacosConfig) Descriptor() ([]byte, []int) {
+ return file_values_types_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *NacosConfig) GetMode() string {
+ if x != nil {
+ return x.Mode
+ }
+ return ""
+}
+
type Values struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -128,13 +278,15 @@ type Values struct {
// Configuration for the base component.
Base *BaseConfig `protobuf:"bytes,2,opt,name=base,proto3"
json:"base,omitempty"`
// Specifies which installation configuration profile to apply.
- Profile string `protobuf:"bytes,3,opt,name=profile,proto3"
json:"profile,omitempty"`
+ Profile string `protobuf:"bytes,3,opt,name=profile,proto3"
json:"profile,omitempty"`
+ Zookeeper *ZookeeperConfig
`protobuf:"bytes,4,opt,name=zookeeper,proto3" json:"zookeeper,omitempty"`
+ Nacos *NacosConfig `protobuf:"bytes,5,opt,name=nacos,proto3"
json:"nacos,omitempty"`
}
func (x *Values) Reset() {
*x = Values{}
if protoimpl.UnsafeEnabled {
- mi := &file_values_types_proto_msgTypes[2]
+ mi := &file_values_types_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -147,7 +299,7 @@ func (x *Values) String() string {
func (*Values) ProtoMessage() {}
func (x *Values) ProtoReflect() protoreflect.Message {
- mi := &file_values_types_proto_msgTypes[2]
+ mi := &file_values_types_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -160,7 +312,7 @@ func (x *Values) ProtoReflect() protoreflect.Message {
// Deprecated: Use Values.ProtoReflect.Descriptor instead.
func (*Values) Descriptor() ([]byte, []int) {
- return file_values_types_proto_rawDescGZIP(), []int{2}
+ return file_values_types_proto_rawDescGZIP(), []int{4}
}
func (x *Values) GetGlobal() *GlobalConfig {
@@ -184,6 +336,20 @@ func (x *Values) GetProfile() string {
return ""
}
+func (x *Values) GetZookeeper() *ZookeeperConfig {
+ if x != nil {
+ return x.Zookeeper
+ }
+ return nil
+}
+
+func (x *Values) GetNacos() *NacosConfig {
+ if x != nil {
+ return x.Nacos
+ }
+ return nil
+}
+
// IntOrString is a type that can hold an int32 or a string. When used in
// JSON or YAML marshalling and unmarshalling, it produces or consumes the
// inner type. This allows you to have, for example, a JSON field that can
@@ -206,7 +372,7 @@ type IntOrString struct {
func (x *IntOrString) Reset() {
*x = IntOrString{}
if protoimpl.UnsafeEnabled {
- mi := &file_values_types_proto_msgTypes[3]
+ mi := &file_values_types_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -219,7 +385,7 @@ func (x *IntOrString) String() string {
func (*IntOrString) ProtoMessage() {}
func (x *IntOrString) ProtoReflect() protoreflect.Message {
- mi := &file_values_types_proto_msgTypes[3]
+ mi := &file_values_types_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -232,7 +398,7 @@ func (x *IntOrString) ProtoReflect() protoreflect.Message {
// Deprecated: Use IntOrString.ProtoReflect.Descriptor instead.
func (*IntOrString) Descriptor() ([]byte, []int) {
- return file_values_types_proto_rawDescGZIP(), []int{3}
+ return file_values_types_proto_rawDescGZIP(), []int{5}
}
func (x *IntOrString) GetType() int64 {
@@ -273,17 +439,61 @@ var file_values_types_proto_rawDesc = []byte{
0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
0x70, 0x72, 0x6f, 0x74,
0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
0x75, 0x65, 0x52, 0x15,
0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x75, 0x62, 0x62, 0x6f, 0x43,
0x6f, 0x6e, 0x66, 0x69,
- 0x67, 0x43, 0x52, 0x44, 0x73, 0x22, 0x9a, 0x01, 0x0a, 0x06, 0x56, 0x61,
0x6c, 0x75, 0x65, 0x73,
- 0x12, 0x3d, 0x0a, 0x06, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x18, 0x01,
0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x25, 0x2e, 0x64, 0x75, 0x62, 0x62, 0x6f, 0x2e, 0x6f, 0x70, 0x65,
0x72, 0x61, 0x74, 0x6f,
- 0x72, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x47,
0x6c, 0x6f, 0x62, 0x61,
- 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x67, 0x6c, 0x6f,
0x62, 0x61, 0x6c, 0x12,
- 0x37, 0x0a, 0x04, 0x62, 0x61, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x23, 0x2e,
- 0x64, 0x75, 0x62, 0x62, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74,
0x6f, 0x72, 0x2e, 0x76,
- 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x42, 0x61, 0x73, 0x65,
0x43, 0x6f, 0x6e, 0x66,
- 0x69, 0x67, 0x52, 0x04, 0x62, 0x61, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
0x70, 0x72, 0x6f, 0x66,
- 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70,
0x72, 0x6f, 0x66, 0x69,
- 0x6c, 0x65, 0x22, 0x8c, 0x01, 0x0a, 0x0b, 0x49, 0x6e, 0x74, 0x4f, 0x72,
0x53, 0x74, 0x72, 0x69,
+ 0x67, 0x43, 0x52, 0x44, 0x73, 0x22, 0x96, 0x04, 0x0a, 0x0f, 0x5a, 0x6f,
0x6f, 0x6b, 0x65, 0x65,
+ 0x70, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3c, 0x0a,
0x0a, 0x64, 0x61, 0x74,
+ 0x61, 0x4c, 0x6f, 0x67, 0x44, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x1c, 0x2e,
+ 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x62, 0x75, 0x66, 0x2e,
+ 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
0x0a, 0x64, 0x61, 0x74,
+ 0x61, 0x4c, 0x6f, 0x67, 0x44, 0x69, 0x72, 0x12, 0x37, 0x0a, 0x08, 0x74,
0x69, 0x63, 0x6b, 0x54,
+ 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e,
0x67, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
0x49, 0x6e, 0x74, 0x36,
+ 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x08, 0x74, 0x69, 0x63, 0x6b,
0x54, 0x69, 0x6d, 0x65,
+ 0x12, 0x39, 0x0a, 0x09, 0x69, 0x6e, 0x69, 0x74, 0x4c, 0x69, 0x6d, 0x69,
0x74, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
0x2e, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56,
0x61, 0x6c, 0x75, 0x65,
+ 0x52, 0x09, 0x69, 0x6e, 0x69, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12,
0x39, 0x0a, 0x09, 0x73,
+ 0x79, 0x6e, 0x63, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01,
0x28, 0x0b, 0x32, 0x1b,
+ 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x62, 0x75, 0x66,
+ 0x2e, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
0x09, 0x73, 0x79, 0x6e,
+ 0x63, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x3f, 0x0a, 0x0c, 0x70, 0x72,
0x65, 0x41, 0x6c, 0x6c,
+ 0x6f, 0x63, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x1b, 0x2e, 0x67,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
0x75, 0x66, 0x2e, 0x49,
+ 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0c, 0x70,
0x72, 0x65, 0x41, 0x6c,
+ 0x6c, 0x6f, 0x63, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x39, 0x0a, 0x09, 0x73,
0x6e, 0x61, 0x70, 0x43,
+ 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b,
0x2e, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
0x2e, 0x49, 0x6e, 0x74,
+ 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x73, 0x6e, 0x61,
0x70, 0x43, 0x6f, 0x75,
+ 0x6e, 0x74, 0x12, 0x56, 0x0a, 0x17, 0x66, 0x6f, 0x75, 0x72, 0x6c, 0x77,
0x43, 0x6f, 0x6d, 0x6d,
+ 0x61, 0x6e, 0x64, 0x73, 0x57, 0x68, 0x69, 0x74, 0x65, 0x6c, 0x69, 0x73,
0x74, 0x18, 0x07, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
0x2e, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
0x56, 0x61, 0x6c, 0x75,
+ 0x65, 0x52, 0x17, 0x66, 0x6f, 0x75, 0x72, 0x6c, 0x77, 0x43, 0x6f, 0x6d,
0x6d, 0x61, 0x6e, 0x64,
+ 0x73, 0x57, 0x68, 0x69, 0x74, 0x65, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x42,
0x0a, 0x0e, 0x6c, 0x69,
+ 0x73, 0x74, 0x65, 0x6e, 0x4f, 0x6e, 0x41, 0x6c, 0x6c, 0x49, 0x50, 0x73,
0x18, 0x08, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
0x75, 0x65, 0x52, 0x0e,
+ 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x4f, 0x6e, 0x41, 0x6c, 0x6c, 0x49,
0x50, 0x73, 0x22, 0x21,
+ 0x0a, 0x0b, 0x4e, 0x61, 0x63, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69,
0x67, 0x12, 0x12, 0x0a,
+ 0x04, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x04, 0x6d, 0x6f, 0x64,
+ 0x65, 0x22, 0x9e, 0x02, 0x0a, 0x06, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73,
0x12, 0x3d, 0x0a, 0x06,
+ 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
0x32, 0x25, 0x2e, 0x64,
+ 0x75, 0x62, 0x62, 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f,
0x72, 0x2e, 0x76, 0x31,
+ 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e, 0x47, 0x6c, 0x6f, 0x62, 0x61,
0x6c, 0x43, 0x6f, 0x6e,
+ 0x66, 0x69, 0x67, 0x52, 0x06, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x12,
0x37, 0x0a, 0x04, 0x62,
+ 0x61, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e,
0x64, 0x75, 0x62, 0x62,
+ 0x6f, 0x2e, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x76,
0x31, 0x61, 0x6c, 0x70,
+ 0x68, 0x61, 0x31, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66,
0x69, 0x67, 0x52, 0x04,
+ 0x62, 0x61, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x66,
0x69, 0x6c, 0x65, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x66, 0x69,
0x6c, 0x65, 0x12, 0x46,
+ 0x0a, 0x09, 0x7a, 0x6f, 0x6f, 0x6b, 0x65, 0x65, 0x70, 0x65, 0x72, 0x18,
0x04, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x28, 0x2e, 0x64, 0x75, 0x62, 0x62, 0x6f, 0x2e, 0x6f, 0x70,
0x65, 0x72, 0x61, 0x74,
+ 0x6f, 0x72, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2e,
0x5a, 0x6f, 0x6f, 0x6b,
+ 0x65, 0x65, 0x70, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
0x09, 0x7a, 0x6f, 0x6f,
+ 0x6b, 0x65, 0x65, 0x70, 0x65, 0x72, 0x12, 0x3a, 0x0a, 0x05, 0x6e, 0x61,
0x63, 0x6f, 0x73, 0x18,
+ 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x64, 0x75, 0x62, 0x62,
0x6f, 0x2e, 0x6f, 0x70,
+ 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x76, 0x31, 0x61, 0x6c, 0x70,
0x68, 0x61, 0x31, 0x2e,
+ 0x4e, 0x61, 0x63, 0x6f, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
0x05, 0x6e, 0x61, 0x63,
+ 0x6f, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x0b, 0x49, 0x6e, 0x74, 0x4f, 0x72,
0x53, 0x74, 0x72, 0x69,
0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
0x20, 0x01, 0x28, 0x03,
0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a, 0x06, 0x69, 0x6e,
0x74, 0x56, 0x61, 0x6c,
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x67, 0x6f, 0x6f,
0x67, 0x6c, 0x65, 0x2e,
@@ -309,27 +519,40 @@ func file_values_types_proto_rawDescGZIP() []byte {
return file_values_types_proto_rawDescData
}
-var file_values_types_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_values_types_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_values_types_proto_goTypes = []interface{}{
(*GlobalConfig)(nil), // 0:
dubbo.operator.v1alpha1.GlobalConfig
(*BaseConfig)(nil), // 1: dubbo.operator.v1alpha1.BaseConfig
- (*Values)(nil), // 2: dubbo.operator.v1alpha1.Values
- (*IntOrString)(nil), // 3:
dubbo.operator.v1alpha1.IntOrString
- (*wrapperspb.BoolValue)(nil), // 4: google.protobuf.BoolValue
- (*wrapperspb.Int32Value)(nil), // 5: google.protobuf.Int32Value
- (*wrapperspb.StringValue)(nil), // 6: google.protobuf.StringValue
+ (*ZookeeperConfig)(nil), // 2:
dubbo.operator.v1alpha1.ZookeeperConfig
+ (*NacosConfig)(nil), // 3:
dubbo.operator.v1alpha1.NacosConfig
+ (*Values)(nil), // 4: dubbo.operator.v1alpha1.Values
+ (*IntOrString)(nil), // 5:
dubbo.operator.v1alpha1.IntOrString
+ (*wrapperspb.BoolValue)(nil), // 6: google.protobuf.BoolValue
+ (*wrapperspb.StringValue)(nil), // 7: google.protobuf.StringValue
+ (*wrapperspb.Int64Value)(nil), // 8: google.protobuf.Int64Value
+ (*wrapperspb.Int32Value)(nil), // 9: google.protobuf.Int32Value
}
var file_values_types_proto_depIdxs = []int32{
- 4, // 0:
dubbo.operator.v1alpha1.BaseConfig.enableDubboConfigCRDs:type_name ->
google.protobuf.BoolValue
- 0, // 1: dubbo.operator.v1alpha1.Values.global:type_name ->
dubbo.operator.v1alpha1.GlobalConfig
- 1, // 2: dubbo.operator.v1alpha1.Values.base:type_name ->
dubbo.operator.v1alpha1.BaseConfig
- 5, // 3: dubbo.operator.v1alpha1.IntOrString.intVal:type_name ->
google.protobuf.Int32Value
- 6, // 4: dubbo.operator.v1alpha1.IntOrString.strVal:type_name ->
google.protobuf.StringValue
- 5, // [5:5] is the sub-list for method output_type
- 5, // [5:5] is the sub-list for method input_type
- 5, // [5:5] is the sub-list for extension type_name
- 5, // [5:5] is the sub-list for extension extendee
- 0, // [0:5] is the sub-list for field type_name
+ 6, // 0:
dubbo.operator.v1alpha1.BaseConfig.enableDubboConfigCRDs:type_name ->
google.protobuf.BoolValue
+ 7, // 1: dubbo.operator.v1alpha1.ZookeeperConfig.dataLogDir:type_name
-> google.protobuf.StringValue
+ 8, // 2: dubbo.operator.v1alpha1.ZookeeperConfig.tickTime:type_name ->
google.protobuf.Int64Value
+ 8, // 3: dubbo.operator.v1alpha1.ZookeeperConfig.initLimit:type_name
-> google.protobuf.Int64Value
+ 8, // 4: dubbo.operator.v1alpha1.ZookeeperConfig.syncLimit:type_name
-> google.protobuf.Int64Value
+ 8, // 5:
dubbo.operator.v1alpha1.ZookeeperConfig.preAllocSize:type_name ->
google.protobuf.Int64Value
+ 8, // 6: dubbo.operator.v1alpha1.ZookeeperConfig.snapCount:type_name
-> google.protobuf.Int64Value
+ 7, // 7:
dubbo.operator.v1alpha1.ZookeeperConfig.fourlwCommandsWhitelist:type_name ->
google.protobuf.StringValue
+ 6, // 8:
dubbo.operator.v1alpha1.ZookeeperConfig.listenOnAllIPs:type_name ->
google.protobuf.BoolValue
+ 0, // 9: dubbo.operator.v1alpha1.Values.global:type_name ->
dubbo.operator.v1alpha1.GlobalConfig
+ 1, // 10: dubbo.operator.v1alpha1.Values.base:type_name ->
dubbo.operator.v1alpha1.BaseConfig
+ 2, // 11: dubbo.operator.v1alpha1.Values.zookeeper:type_name ->
dubbo.operator.v1alpha1.ZookeeperConfig
+ 3, // 12: dubbo.operator.v1alpha1.Values.nacos:type_name ->
dubbo.operator.v1alpha1.NacosConfig
+ 9, // 13: dubbo.operator.v1alpha1.IntOrString.intVal:type_name ->
google.protobuf.Int32Value
+ 7, // 14: dubbo.operator.v1alpha1.IntOrString.strVal:type_name ->
google.protobuf.StringValue
+ 15, // [15:15] is the sub-list for method output_type
+ 15, // [15:15] is the sub-list for method input_type
+ 15, // [15:15] is the sub-list for extension type_name
+ 15, // [15:15] is the sub-list for extension extendee
+ 0, // [0:15] is the sub-list for field type_name
}
func init() { file_values_types_proto_init() }
@@ -363,7 +586,7 @@ func file_values_types_proto_init() {
}
}
file_values_types_proto_msgTypes[2].Exporter = func(v
interface{}, i int) interface{} {
- switch v := v.(*Values); i {
+ switch v := v.(*ZookeeperConfig); i {
case 0:
return &v.state
case 1:
@@ -375,6 +598,30 @@ func file_values_types_proto_init() {
}
}
file_values_types_proto_msgTypes[3].Exporter = func(v
interface{}, i int) interface{} {
+ switch v := v.(*NacosConfig); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_values_types_proto_msgTypes[4].Exporter = func(v
interface{}, i int) interface{} {
+ switch v := v.(*Values); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_values_types_proto_msgTypes[5].Exporter = func(v
interface{}, i int) interface{} {
switch v := v.(*IntOrString); i {
case 0:
return &v.state
@@ -393,7 +640,7 @@ func file_values_types_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_values_types_proto_rawDesc,
NumEnums: 0,
- NumMessages: 4,
+ NumMessages: 6,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/operator/pkg/component/component.go
b/operator/pkg/component/component.go
index 6c7b7cbc..c1cb397c 100644
--- a/operator/pkg/component/component.go
+++ b/operator/pkg/component/component.go
@@ -136,7 +136,6 @@ func (c Component) Get(merged values.Map)
([]apis.MetadataCompSpec, error) {
if !ok {
return defaultResp, nil
}
-
spec, err := buildSpec(s)
if err != nil {
return nil, err
