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 f0ede23f Update dubboctl and operator code logic (#856)
f0ede23f is described below
commit f0ede23fcd330d3b95eaacb545d16d42d7413b9d
Author: mfordjody <[email protected]>
AuthorDate: Sun Jan 25 04:06:18 2026 +0800
Update dubboctl and operator code logic (#856)
---
.../docker/{dockerfile.planet => dockerfile.dubbo} | 0
.../{dockerfile.proxyadapter => dockerfile.proxy} | 0
manifests/profiles/default.yaml | 7 ++----
manifests/profiles/demo.yaml | 25 ----------------------
manifests/profiles/empty.yaml | 5 ++---
operator/pkg/apis/types.go | 5 -----
operator/pkg/component/component.go | 21 +++++++++---------
7 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/dubbod/discovery/docker/dockerfile.planet
b/dubbod/discovery/docker/dockerfile.dubbo
similarity index 100%
rename from dubbod/discovery/docker/dockerfile.planet
rename to dubbod/discovery/docker/dockerfile.dubbo
diff --git a/dubbod/discovery/docker/dockerfile.proxyadapter
b/dubbod/discovery/docker/dockerfile.proxy
similarity index 100%
rename from dubbod/discovery/docker/dockerfile.proxyadapter
rename to dubbod/discovery/docker/dockerfile.proxy
diff --git a/manifests/profiles/default.yaml b/manifests/profiles/default.yaml
index 4ab16720..96a51c4c 100644
--- a/manifests/profiles/default.yaml
+++ b/manifests/profiles/default.yaml
@@ -22,12 +22,9 @@ spec:
components:
base:
enabled: true
- discovery:
- dubbo:
- enabled: true
+ dubbo:
+ enabled: true
values:
global: {}
- base: {}
-
diff --git a/manifests/profiles/demo.yaml b/manifests/profiles/demo.yaml
deleted file mode 100644
index 7948a4d7..00000000
--- a/manifests/profiles/demo.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: install.dubbo.apache.org/v1alpha1
-kind: DubboOperator
-metadata:
- namespace: dubbo-system
-spec:
- components:
- base:
- enabled: true
- values:
- profile: demo
\ No newline at end of file
diff --git a/manifests/profiles/empty.yaml b/manifests/profiles/empty.yaml
index 8c54f5ec..0911b7f3 100644
--- a/manifests/profiles/empty.yaml
+++ b/manifests/profiles/empty.yaml
@@ -19,6 +19,5 @@ spec:
components:
base:
enabled: false
- discovery:
- dubbo:
- enabled: false
+ dubbo:
+ enabled: false
diff --git a/operator/pkg/apis/types.go b/operator/pkg/apis/types.go
index 40f25f4a..f96669f7 100644
--- a/operator/pkg/apis/types.go
+++ b/operator/pkg/apis/types.go
@@ -53,11 +53,6 @@ type DubboComponentSpec struct {
// Used for Dubbo resources.
Base *BaseComponentSpec `json:"base,omitempty"`
// Using Dubbo as the control plane.
- Discovery *DiscoverySpec `json:"discovery,omitempty"`
-}
-
-type DiscoverySpec struct {
- // Dubbo component
Dubbo *DiscoveryComponentSpec `json:"dubbo,omitempty"`
}
diff --git a/operator/pkg/component/component.go
b/operator/pkg/component/component.go
index 75118dc8..c6e36888 100644
--- a/operator/pkg/component/component.go
+++ b/operator/pkg/component/component.go
@@ -53,19 +53,18 @@ var AllComponents = []Component{
UserFacingName: BaseComponentName,
SpecName: "base",
ResourceType: "Base",
- Default: true,
HelmSubDir: "base",
+ Default: true,
HelmValuesTreeRoot: "global",
},
{
- UserFacingName: DubboDiscoveryComponentName,
- SpecName: "dubbo",
- ResourceType: "Deployment",
- ResourceName: "dubbod",
- ContainerName: "dubbo-discovery",
- Default: true,
- HelmSubDir: "dubbo-control/dubbo-discovery",
- HelmValuesTreeRoot: "global",
+ UserFacingName: DubboDiscoveryComponentName,
+ SpecName: "dubbo",
+ ResourceType: "Deployment",
+ ResourceName: "dubbo",
+ ContainerName: "dubbo-discovery",
+ Default: true,
+ HelmSubDir: "dubbo-control/dubbo-discovery",
},
}
@@ -76,8 +75,8 @@ var (
}
Icons = map[Name]string{
- BaseComponentName: "🔮",
- DubboDiscoveryComponentName: "🪐",
+ BaseComponentName: "⚡️",
+ DubboDiscoveryComponentName: "⚡️",
}
)
