This is an automated email from the ASF dual-hosted git repository.
mfordjody 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 8ad164c1 Update rename (#921)
8ad164c1 is described below
commit 8ad164c1736b299aa5254180eea31f58ac7ea7b1
Author: mfordjody <[email protected]>
AuthorDate: Fri Jun 19 00:50:44 2026 +0800
Update rename (#921)
---
.github/workflows/ci.yml | 8 +-
.github/workflows/release.yaml | 22 ++--
Makefile | 4 +-
README.md | 6 +-
{dubboctl => cli}/cmd/admin.go | 2 +-
{dubboctl => cli}/cmd/admin_test.go | 0
{dubboctl => cli}/cmd/create.go | 8 +-
{dubboctl => cli}/cmd/dashboard.go | 2 +-
{dubboctl => cli}/cmd/dashboard_test.go | 0
{dubboctl => cli}/cmd/get.go | 2 +-
{dubboctl => cli}/cmd/get_test.go | 0
{dubboctl => cli}/cmd/gui.go | 0
{dubboctl => cli}/cmd/gui_test.go | 0
{dubboctl => cli}/cmd/image.go | 12 +-
{dubboctl => cli}/cmd/multicluster.go | 0
{dubboctl => cli}/cmd/multicluster_test.go | 0
{dubboctl => cli}/cmd/repo.go | 6 +-
{dubboctl => cli}/cmd/root.go | 22 ++--
{dubboctl => cli}/main.go | 2 +-
{dubboctl => cli}/pkg/cli/context.go | 2 +-
{dubboctl => cli}/pkg/cli/options.go | 2 +-
{dubboctl => cli}/pkg/hub/builder/builder.go | 2 +-
.../pkg/hub/builder/dockerfile/build.go | 4 +-
{dubboctl => cli}/pkg/hub/builder/pack/build.go | 6 +-
{dubboctl => cli}/pkg/hub/client.go | 2 +-
.../pkg/hub/credentials/credentials.go | 2 +-
.../pkg/hub/credentials/prompt/prompt.go | 4 +-
{dubboctl => cli}/pkg/hub/deployer/deploy.tpl | 0
{dubboctl => cli}/pkg/hub/deployer/deployer.go | 6 +-
{dubboctl => cli}/pkg/hub/pusher/pusher.go | 4 +-
{dubboctl => cli}/pkg/hub/pusher/transport.go | 0
{dubboctl => cli}/pkg/hub/ssh/agent.go | 0
{dubboctl => cli}/pkg/hub/ssh/agent_windows.go | 0
{dubboctl => cli}/pkg/hub/ssh/dialer.go | 0
{dubboctl => cli}/pkg/hub/ssh/terminal.go | 0
{dubboctl => cli}/pkg/sdk/client.go | 4 +-
{dubboctl => cli}/pkg/sdk/dubbo/config.go | 0
{dubboctl => cli}/pkg/sdk/dubbo/dockerfile.go | 0
{dubboctl => cli}/pkg/sdk/repositories.go | 0
{dubboctl => cli}/pkg/sdk/repository.go | 2 +-
{dubboctl => cli}/pkg/sdk/template.go | 4 +-
{dubboctl => cli}/pkg/sdk/templates.go | 4 +-
{dubboctl => cli}/pkg/sdk/templates_embedded.go | 4 +-
.../pkg/sdk/tpl/default/manifest.yaml | 0
{dubboctl => cli}/pkg/sdk/tpl/filesystem.go | 4 +-
.../pkg/sdk/tpl/zz_filesystem_generated.go | 0
{dubboctl => cli}/pkg/util/err.go | 0
{dubboctl => cli}/pkg/util/file.go | 0
{dubboctl => cli}/pkg/util/fs.go | 0
{dubboctl => cli}/pkg/util/path.go | 0
{dubboctl => cli}/pkg/util/sortedset.go | 0
{dubboctl => cli}/pkg/validate/validate.go | 6 +-
{dubboctl => cli}/pkg/version/version.go | 0
{dubbo-cni => cni}/main.go | 0
dubbocni/main.go | 139 ---------------------
dubbod/discovery/docker/dockerfile.dubbod | 2 +-
.../kube/gateway/deployment_controller_test.go | 2 +-
{dubboinstaller => manifests}/charts/README.md | 0
.../charts/base/Chart.yaml | 0
.../charts/base/README.md | 0
.../charts/base/files/crd-all.gen.yaml | 0
.../charts/base/templates/_helpers.tpl | 0
.../charts/base/templates/crds.yaml | 0
.../charts/base/templates/zzz_profile.yaml | 0
.../charts/base/values.yaml | 0
.../charts/dubbod/Chart.yaml | 0
.../charts/dubbod/README.md | 0
.../charts/dubbod/files/grpc-engine.yaml | 0
.../charts/dubbod/files/kube-gateway.yaml | 0
.../charts/dubbod/templates/clusterrole.yaml | 0
.../dubbod/templates/clusterrolebinding.yaml | 0
.../charts/dubbod/templates/cni-daemonset.yaml | 0
.../dubbod/templates/configmap-injector.yaml | 0
.../charts/dubbod/templates/configmap-values.yaml | 0
.../charts/dubbod/templates/configmap.yaml | 0
.../charts/dubbod/templates/deployment.yaml | 0
.../charts/dubbod/templates/eastwest-gateway.yaml | 0
.../templates/mutatingwebhookconfiguration.yaml | 0
.../charts/dubbod/templates/service.yaml | 0
.../charts/dubbod/templates/serviceaccount.yaml | 0
.../templates/validatingwebhookconfiguration.yaml | 0
.../charts/dubbod/templates/zzz_profile.yaml | 0
.../charts/dubbod/values.yaml | 0
{dubboinstaller => manifests}/manifest.go | 2 +-
.../profiles/default.yaml | 0
{dubboinstaller => manifests}/profiles/empty.yaml | 0
{dubbooperator => operator}/cmd/cluster/install.go | 10 +-
.../cmd/cluster/manifest.go | 8 +-
{dubbooperator => operator}/cmd/cluster/root.go | 0
{dubbooperator => operator}/cmd/cluster/shared.go | 0
.../cmd/cluster/uninstall.go | 10 +-
{dubbooperator => operator}/cmd/cluster/upgrade.go | 6 +-
.../cmd/validation/validation.go | 6 +-
.../apis/proto/k8s/io/api/core/v1/generated.proto | 0
.../apimachinery/pkg/apis/meta/v1/generated.proto | 0
.../pkg/apis/proto/values_types.proto | 2 +-
{dubbooperator => operator}/pkg/apis/register.go | 0
{dubbooperator => operator}/pkg/apis/types.go | 0
.../pkg/apis/validation/validation.go | 6 +-
.../pkg/apis/values_types.pb.go | 2 +-
.../pkg/apis/values_types_json.go | 0
.../pkg/component/component.go | 4 +-
{dubbooperator => operator}/pkg/config/gvk.go | 0
{dubbooperator => operator}/pkg/helm/helm.go | 10 +-
{dubbooperator => operator}/pkg/helm/path.go | 0
.../pkg/helm/path_windows.go | 0
.../pkg/install/installer.go | 16 +--
{dubbooperator => operator}/pkg/install/waiter.go | 4 +-
.../pkg/manifest/manifest.go | 4 +-
{dubbooperator => operator}/pkg/manifest/name.go | 0
{dubbooperator => operator}/pkg/render/manifest.go | 20 +--
.../pkg/render/manifest_test.go | 2 +-
.../pkg/render/postprocess.go | 6 +-
{dubbooperator => operator}/pkg/schema/impl.go | 2 +-
{dubbooperator => operator}/pkg/uninstall/prune.go | 10 +-
{dubbooperator => operator}/pkg/util/clog/clog.go | 0
.../pkg/util/dmultierr/dmultierr.go | 0
{dubbooperator => operator}/pkg/util/errs.go | 0
{dubbooperator => operator}/pkg/util/k8s.go | 0
{dubbooperator => operator}/pkg/util/label.go | 0
{dubbooperator => operator}/pkg/util/parts.go | 0
.../pkg/util/progress/progress.go | 2 +-
{dubbooperator => operator}/pkg/util/ptr/ptr.go | 0
{dubbooperator => operator}/pkg/values/map.go | 2 +-
pkg/config/schema/kubetypes/common.go | 2 +-
pkg/kube/inject/proxyless_test.go | 8 +-
pkg/kube/inject/webhook.go | 2 +-
127 files changed, 154 insertions(+), 293 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0a846ac..09733d4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -143,13 +143,13 @@ jobs:
version: '3.13.0'
- name: Lint base chart
- run: helm lint dubboinstaller/charts/base
+ run: helm lint manifests/charts/base
- name: Lint dubbod chart
- run: helm lint dubboinstaller/charts/dubbod
+ run: helm lint manifests/charts/dubbod
- name: Validate base chart template rendering
- run: helm template test-release dubboinstaller/charts/base --debug
+ run: helm template test-release manifests/charts/base --debug
- name: Validate dubbod chart template rendering
- run: helm template test-release dubboinstaller/charts/dubbod --debug
+ run: helm template test-release manifests/charts/dubbod --debug
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ae73f194..50562c30 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -176,11 +176,11 @@ jobs:
GOARCH: ${{ matrix.goarch }}
GIT_VERSION: ${{ github.ref_name }}
run: |
- mkdir -p build/dubboctl
+ mkdir -p build/cli
make build-dubboctl GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
- cp README.md LICENSE build/dubboctl/
- mv bin/dubboctl* build/dubboctl/
- ls -ln build/dubboctl/
+ cp README.md LICENSE build/cli/
+ mv bin/dubboctl* build/cli/
+ ls -ln build/cli/
- name: Dubbo Build binary
env:
@@ -188,18 +188,18 @@ jobs:
GOARCH: ${{ matrix.goarch }}
GIT_VERSION: ${{ github.ref_name }}
run: |
- mkdir -p build/dubboctl
+ mkdir -p build/cli
make build-dubboctl GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
make clone-sample GOOS=${GOOS} GOARCH=${GOARCH}
GIT_VERSION=${GIT_VERSION}
cp README.md LICENSE build/
- mv bin/dubboctl* build/dubboctl/
+ mv bin/dubboctl* build/cli/
mv bin/samples/ build/
- ls -ln build/dubboctl/ ; ls -ln build/
+ ls -ln build/cli/ ; ls -ln build/
- name: Dubboctl Rename windows
if: matrix.goos == 'windows'
run: |
- cp build/dubboctl/dubboctl build/dubboctl/dubboctl.exe
+ cp build/cli/dubboctl build/cli/dubboctl.exe
- name: dubboctl Package files
id: package_ctl
@@ -208,9 +208,9 @@ jobs:
FILENAME=dubboctl-${VERSION}-${{ matrix.goos }}-${{ matrix.goarch }}
DIRNAME=dubboctl-${VERSION}
mkdir -p ${DIRNAME}/bin
- cp build/dubboctl/dubboctl ${DIRNAME}/bin
+ cp build/cli/dubboctl ${DIRNAME}/bin
ls -ln ${DIRNAME}/bin
- cp build/dubboctl/README.md build/dubboctl/LICENSE ${DIRNAME}
+ cp build/cli/README.md build/cli/LICENSE ${DIRNAME}
ls -Rlh ${DIRNAME}
if [ "${{ matrix.goos }}" = "windows" ]; then
zip -r ${FILENAME}.zip ${DIRNAME}/bin
@@ -227,7 +227,7 @@ jobs:
FILENAME=dubbo-${VERSION}-${{ matrix.goos }}-${{ matrix.goarch }}
DIRNAME=dubbo-${VERSION}
mkdir -p ${DIRNAME}/bin
- cp build/dubboctl/dubboctl ${DIRNAME}/bin/
+ cp build/cli/dubboctl ${DIRNAME}/bin/
cp build/README.md build/LICENSE ${DIRNAME}
cp -r build/samples ${DIRNAME}
ls -Rlh ${DIRNAME}
diff --git a/Makefile b/Makefile
index abc13722..67dbbea9 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,12 @@
build-dubboctl:
CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build \
-ldflags "-X
github.com/apache/dubbo-kubernetes/pkg/version.gitTag=$(GIT_VERSION)" \
- -o bin/dubboctl dubboctl/main.go
+ -o bin/dubboctl cli/main.go
.PHONY: build-dubbo-cni
build-dubbo-cni:
CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) go build \
- -o bin/dubbo-cni dubbo-cni/main.go
+ -o bin/dubbo-cni cni/main.go
.PHONY: clone-sample
clone-sample:
diff --git a/README.md b/README.md
index 49018281..e741f6f2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache Kdubbo
+# Apache Kdubbo (dubbo-mesh)
[](https://pkg.go.dev/github.com/apache/dubbo-kubernetes)
[](https://goreportcard.com/report/github.com/apache/dubbo-kubernetes)
@@ -29,11 +29,11 @@ Projects are distributed across the code directory
repositories:
- [dubbo/client-go](https://github.com/kdubbo/client-go). — Defines the
Kubernetes clients automatically generated for Dubbo control plane resources.
-- [dubbo/dubboctl](./dubboctl). — Provides command line tools for control
plane management and other operations.
+- [dubbo/cli](./cli). — Provides dubboctl command line tools for control plane
management and other operations.
- [dubbo/dubbod](./dubbod) — The main code directory for the Dubbo control
plane.
-- [dubbo/operator](./dubbooperator). — Provides user friendly options for
operating the service mesh.
+- [dubbo/operator](./operator). — Provides user friendly options for operating
the service mesh.
## Contributing
diff --git a/dubboctl/cmd/admin.go b/cli/cmd/admin.go
similarity index 98%
rename from dubboctl/cmd/admin.go
rename to cli/cmd/admin.go
index 04bf509f..63d9d88b 100644
--- a/dubboctl/cmd/admin.go
+++ b/cli/cmd/admin.go
@@ -22,7 +22,7 @@ import (
"io"
"sort"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
"github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/dubboctl/cmd/admin_test.go b/cli/cmd/admin_test.go
similarity index 100%
rename from dubboctl/cmd/admin_test.go
rename to cli/cmd/admin_test.go
diff --git a/dubboctl/cmd/create.go b/cli/cmd/create.go
similarity index 97%
rename from dubboctl/cmd/create.go
rename to cli/cmd/create.go
index 4616f881..4e792fd2 100644
--- a/dubboctl/cmd/create.go
+++ b/cli/cmd/create.go
@@ -19,10 +19,10 @@ package cmd
import (
"errors"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
- "github.com/apache/dubbo-kubernetes/dubbooperator/cmd/cluster"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/operator/cmd/cluster"
"github.com/ory/viper"
"github.com/spf13/cobra"
"os"
diff --git a/dubboctl/cmd/dashboard.go b/cli/cmd/dashboard.go
similarity index 99%
rename from dubboctl/cmd/dashboard.go
rename to cli/cmd/dashboard.go
index b37e5d52..4705c691 100644
--- a/dubboctl/cmd/dashboard.go
+++ b/cli/cmd/dashboard.go
@@ -27,7 +27,7 @@ import (
"path/filepath"
"time"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"github.com/spf13/cobra"
appsv1 "k8s.io/api/apps/v1"
diff --git a/dubboctl/cmd/dashboard_test.go b/cli/cmd/dashboard_test.go
similarity index 100%
rename from dubboctl/cmd/dashboard_test.go
rename to cli/cmd/dashboard_test.go
diff --git a/dubboctl/cmd/get.go b/cli/cmd/get.go
similarity index 99%
rename from dubboctl/cmd/get.go
rename to cli/cmd/get.go
index cc0105ea..bf5d6079 100644
--- a/dubboctl/cmd/get.go
+++ b/cli/cmd/get.go
@@ -25,7 +25,7 @@ import (
"text/tabwriter"
"time"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
"github.com/apache/dubbo-kubernetes/pkg/kube/inject"
"github.com/kdubbo/api/annotation"
"github.com/spf13/cobra"
diff --git a/dubboctl/cmd/get_test.go b/cli/cmd/get_test.go
similarity index 100%
rename from dubboctl/cmd/get_test.go
rename to cli/cmd/get_test.go
diff --git a/dubboctl/cmd/gui.go b/cli/cmd/gui.go
similarity index 100%
rename from dubboctl/cmd/gui.go
rename to cli/cmd/gui.go
diff --git a/dubboctl/cmd/gui_test.go b/cli/cmd/gui_test.go
similarity index 100%
rename from dubboctl/cmd/gui_test.go
rename to cli/cmd/gui_test.go
diff --git a/dubboctl/cmd/image.go b/cli/cmd/image.go
similarity index 96%
rename from dubboctl/cmd/image.go
rename to cli/cmd/image.go
index 612dd6d9..103911df 100644
--- a/dubboctl/cmd/image.go
+++ b/cli/cmd/image.go
@@ -24,12 +24,12 @@ import (
"strings"
"github.com/AlecAivazis/survey/v2"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/builder/dockerfile"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/builder/pack"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/builder/dockerfile"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/builder/pack"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
"github.com/ory/viper"
"github.com/spf13/cobra"
)
diff --git a/dubboctl/cmd/multicluster.go b/cli/cmd/multicluster.go
similarity index 100%
rename from dubboctl/cmd/multicluster.go
rename to cli/cmd/multicluster.go
diff --git a/dubboctl/cmd/multicluster_test.go b/cli/cmd/multicluster_test.go
similarity index 100%
rename from dubboctl/cmd/multicluster_test.go
rename to cli/cmd/multicluster_test.go
diff --git a/dubboctl/cmd/repo.go b/cli/cmd/repo.go
similarity index 96%
rename from dubboctl/cmd/repo.go
rename to cli/cmd/repo.go
index 43748463..33442c67 100644
--- a/dubboctl/cmd/repo.go
+++ b/cli/cmd/repo.go
@@ -18,9 +18,9 @@ package cmd
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubbooperator/cmd/cluster"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/cmd/cluster"
"github.com/spf13/cobra"
)
diff --git a/dubboctl/cmd/root.go b/cli/cmd/root.go
similarity index 87%
rename from dubboctl/cmd/root.go
rename to cli/cmd/root.go
index 7e4059b9..0a2fca8d 100644
--- a/dubboctl/cmd/root.go
+++ b/cli/cmd/root.go
@@ -19,17 +19,17 @@ package cmd
import (
"flag"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/builder/pack"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/credentials"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/credentials/prompt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/deployer"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/pusher"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/validate"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/version"
- "github.com/apache/dubbo-kubernetes/dubbooperator/cmd/cluster"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/builder/pack"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/credentials"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/credentials/prompt"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/deployer"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/pusher"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/validate"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/version"
+ "github.com/apache/dubbo-kubernetes/operator/cmd/cluster"
"github.com/spf13/cobra"
"net/http"
"os"
diff --git a/dubboctl/main.go b/cli/main.go
similarity index 94%
rename from dubboctl/main.go
rename to cli/main.go
index 351e0f20..6e6414c2 100644
--- a/dubboctl/main.go
+++ b/cli/main.go
@@ -21,7 +21,7 @@ import (
)
import (
- "github.com/apache/dubbo-kubernetes/dubboctl/cmd"
+ "github.com/apache/dubbo-kubernetes/cli/cmd"
)
func main() {
diff --git a/dubboctl/pkg/cli/context.go b/cli/pkg/cli/context.go
similarity index 97%
rename from dubboctl/pkg/cli/context.go
rename to cli/pkg/cli/context.go
index 244f05d9..fa32095c 100644
--- a/dubboctl/pkg/cli/context.go
+++ b/cli/pkg/cli/context.go
@@ -17,7 +17,7 @@
package cli
import (
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/ptr"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/ptr"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"k8s.io/client-go/rest"
)
diff --git a/dubboctl/pkg/cli/options.go b/cli/pkg/cli/options.go
similarity index 95%
rename from dubboctl/pkg/cli/options.go
rename to cli/pkg/cli/options.go
index 24b73fb9..a88c1387 100644
--- a/dubboctl/pkg/cli/options.go
+++ b/cli/pkg/cli/options.go
@@ -17,7 +17,7 @@
package cli
import (
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/ptr"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/ptr"
"github.com/spf13/pflag"
)
diff --git a/dubboctl/pkg/hub/builder/builder.go
b/cli/pkg/hub/builder/builder.go
similarity index 96%
rename from dubboctl/pkg/hub/builder/builder.go
rename to cli/pkg/hub/builder/builder.go
index 9bec3046..6ce5a5d4 100644
--- a/dubboctl/pkg/hub/builder/builder.go
+++ b/cli/pkg/hub/builder/builder.go
@@ -18,7 +18,7 @@ package builder
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
)
const (
diff --git a/dubboctl/pkg/hub/builder/dockerfile/build.go
b/cli/pkg/hub/builder/dockerfile/build.go
similarity index 93%
rename from dubboctl/pkg/hub/builder/dockerfile/build.go
rename to cli/pkg/hub/builder/dockerfile/build.go
index b71bf1d7..c5f7f9dc 100644
--- a/dubboctl/pkg/hub/builder/dockerfile/build.go
+++ b/cli/pkg/hub/builder/dockerfile/build.go
@@ -18,8 +18,8 @@ package dockerfile
import (
"context"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
"github.com/containers/storage/pkg/archive"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
diff --git a/dubboctl/pkg/hub/builder/pack/build.go
b/cli/pkg/hub/builder/pack/build.go
similarity index 95%
rename from dubboctl/pkg/hub/builder/pack/build.go
rename to cli/pkg/hub/builder/pack/build.go
index eda32c4c..757646d2 100644
--- a/dubboctl/pkg/hub/builder/pack/build.go
+++ b/cli/pkg/hub/builder/pack/build.go
@@ -20,9 +20,9 @@ import (
"bytes"
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/builder"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/builder"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
pack "github.com/buildpacks/pack/pkg/client"
"github.com/buildpacks/pack/pkg/logging"
"github.com/buildpacks/pack/pkg/project/types"
diff --git a/dubboctl/pkg/hub/client.go b/cli/pkg/hub/client.go
similarity index 98%
rename from dubboctl/pkg/hub/client.go
rename to cli/pkg/hub/client.go
index e3a3567a..b237bd58 100644
--- a/dubboctl/pkg/hub/client.go
+++ b/cli/pkg/hub/client.go
@@ -30,7 +30,7 @@ import (
"strconv"
"time"
- fnssh "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/ssh"
+ fnssh "github.com/apache/dubbo-kubernetes/cli/pkg/hub/ssh"
"github.com/docker/cli/cli/config"
"github.com/docker/docker/client"
"github.com/docker/go-connections/tlsconfig"
diff --git a/dubboctl/pkg/hub/credentials/credentials.go
b/cli/pkg/hub/credentials/credentials.go
similarity index 99%
rename from dubboctl/pkg/hub/credentials/credentials.go
rename to cli/pkg/hub/credentials/credentials.go
index b33bc54d..f95f6291 100644
--- a/dubboctl/pkg/hub/credentials/credentials.go
+++ b/cli/pkg/hub/credentials/credentials.go
@@ -29,7 +29,7 @@ import (
"runtime"
"strings"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/pusher"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/pusher"
dockerConfig "github.com/containers/image/v5/pkg/docker/config"
containersTypes "github.com/containers/image/v5/types"
"github.com/docker/docker-credential-helpers/client"
diff --git a/dubboctl/pkg/hub/credentials/prompt/prompt.go
b/cli/pkg/hub/credentials/prompt/prompt.go
similarity index 97%
rename from dubboctl/pkg/hub/credentials/prompt/prompt.go
rename to cli/pkg/hub/credentials/prompt/prompt.go
index 2a77c104..66f5e1d9 100644
--- a/dubboctl/pkg/hub/credentials/prompt/prompt.go
+++ b/cli/pkg/hub/credentials/prompt/prompt.go
@@ -28,8 +28,8 @@ import (
"github.com/AlecAivazis/survey/v2"
"github.com/AlecAivazis/survey/v2/terminal"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/credentials"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub/pusher"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/credentials"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub/pusher"
"golang.org/x/term"
)
diff --git a/dubboctl/pkg/hub/deployer/deploy.tpl
b/cli/pkg/hub/deployer/deploy.tpl
similarity index 100%
rename from dubboctl/pkg/hub/deployer/deploy.tpl
rename to cli/pkg/hub/deployer/deploy.tpl
diff --git a/dubboctl/pkg/hub/deployer/deployer.go
b/cli/pkg/hub/deployer/deployer.go
similarity index 93%
rename from dubboctl/pkg/hub/deployer/deployer.go
rename to cli/pkg/hub/deployer/deployer.go
index 2927906a..8ec426da 100644
--- a/dubboctl/pkg/hub/deployer/deployer.go
+++ b/cli/pkg/hub/deployer/deployer.go
@@ -23,9 +23,9 @@ import (
"os"
template2 "text/template"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
)
const (
diff --git a/dubboctl/pkg/hub/pusher/pusher.go b/cli/pkg/hub/pusher/pusher.go
similarity index 98%
rename from dubboctl/pkg/hub/pusher/pusher.go
rename to cli/pkg/hub/pusher/pusher.go
index 556e6644..72b7a1fa 100644
--- a/dubboctl/pkg/hub/pusher/pusher.go
+++ b/cli/pkg/hub/pusher/pusher.go
@@ -23,8 +23,8 @@ import (
"encoding/json"
"errors"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/hub"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/hub"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/docker/docker/pkg/jsonmessage"
diff --git a/dubboctl/pkg/hub/pusher/transport.go
b/cli/pkg/hub/pusher/transport.go
similarity index 100%
rename from dubboctl/pkg/hub/pusher/transport.go
rename to cli/pkg/hub/pusher/transport.go
diff --git a/dubboctl/pkg/hub/ssh/agent.go b/cli/pkg/hub/ssh/agent.go
similarity index 100%
rename from dubboctl/pkg/hub/ssh/agent.go
rename to cli/pkg/hub/ssh/agent.go
diff --git a/dubboctl/pkg/hub/ssh/agent_windows.go
b/cli/pkg/hub/ssh/agent_windows.go
similarity index 100%
rename from dubboctl/pkg/hub/ssh/agent_windows.go
rename to cli/pkg/hub/ssh/agent_windows.go
diff --git a/dubboctl/pkg/hub/ssh/dialer.go b/cli/pkg/hub/ssh/dialer.go
similarity index 100%
rename from dubboctl/pkg/hub/ssh/dialer.go
rename to cli/pkg/hub/ssh/dialer.go
diff --git a/dubboctl/pkg/hub/ssh/terminal.go b/cli/pkg/hub/ssh/terminal.go
similarity index 100%
rename from dubboctl/pkg/hub/ssh/terminal.go
rename to cli/pkg/hub/ssh/terminal.go
diff --git a/dubboctl/pkg/sdk/client.go b/cli/pkg/sdk/client.go
similarity index 98%
rename from dubboctl/pkg/sdk/client.go
rename to cli/pkg/sdk/client.go
index b2aefbd9..bf71df95 100644
--- a/dubboctl/pkg/sdk/client.go
+++ b/cli/pkg/sdk/client.go
@@ -25,8 +25,8 @@ import (
"strings"
"time"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
diff --git a/dubboctl/pkg/sdk/dubbo/config.go b/cli/pkg/sdk/dubbo/config.go
similarity index 100%
rename from dubboctl/pkg/sdk/dubbo/config.go
rename to cli/pkg/sdk/dubbo/config.go
diff --git a/dubboctl/pkg/sdk/dubbo/dockerfile.go
b/cli/pkg/sdk/dubbo/dockerfile.go
similarity index 100%
rename from dubboctl/pkg/sdk/dubbo/dockerfile.go
rename to cli/pkg/sdk/dubbo/dockerfile.go
diff --git a/dubboctl/pkg/sdk/repositories.go b/cli/pkg/sdk/repositories.go
similarity index 100%
rename from dubboctl/pkg/sdk/repositories.go
rename to cli/pkg/sdk/repositories.go
diff --git a/dubboctl/pkg/sdk/repository.go b/cli/pkg/sdk/repository.go
similarity index 99%
rename from dubboctl/pkg/sdk/repository.go
rename to cli/pkg/sdk/repository.go
index 71ad42bf..888d4951 100644
--- a/dubboctl/pkg/sdk/repository.go
+++ b/cli/pkg/sdk/repository.go
@@ -19,7 +19,7 @@ package sdk
import (
"errors"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
"github.com/go-git/go-billy/v5/memfs"
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
diff --git a/dubboctl/pkg/sdk/template.go b/cli/pkg/sdk/template.go
similarity index 92%
rename from dubboctl/pkg/sdk/template.go
rename to cli/pkg/sdk/template.go
index 5b9e8290..803209e3 100644
--- a/dubboctl/pkg/sdk/template.go
+++ b/cli/pkg/sdk/template.go
@@ -18,8 +18,8 @@ package sdk
import (
"context"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
"path"
)
diff --git a/dubboctl/pkg/sdk/templates.go b/cli/pkg/sdk/templates.go
similarity index 95%
rename from dubboctl/pkg/sdk/templates.go
rename to cli/pkg/sdk/templates.go
index 2ccbbe4d..e0d1360d 100644
--- a/dubboctl/pkg/sdk/templates.go
+++ b/cli/pkg/sdk/templates.go
@@ -18,8 +18,8 @@ package sdk
import (
"context"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/dubbo"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/dubbo"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
"strings"
)
diff --git a/dubboctl/pkg/sdk/templates_embedded.go
b/cli/pkg/sdk/templates_embedded.go
similarity index 90%
rename from dubboctl/pkg/sdk/templates_embedded.go
rename to cli/pkg/sdk/templates_embedded.go
index 93398a23..53031e5c 100644
--- a/dubboctl/pkg/sdk/templates_embedded.go
+++ b/cli/pkg/sdk/templates_embedded.go
@@ -19,8 +19,8 @@ package sdk
import (
"archive/zip"
"bytes"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/sdk/tpl"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/util"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/sdk/tpl"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/util"
)
func newEmbeddedTemplatesFS() util.Filesystem {
diff --git a/dubboctl/pkg/sdk/tpl/default/manifest.yaml
b/cli/pkg/sdk/tpl/default/manifest.yaml
similarity index 100%
rename from dubboctl/pkg/sdk/tpl/default/manifest.yaml
rename to cli/pkg/sdk/tpl/default/manifest.yaml
diff --git a/dubboctl/pkg/sdk/tpl/filesystem.go b/cli/pkg/sdk/tpl/filesystem.go
similarity index 97%
rename from dubboctl/pkg/sdk/tpl/filesystem.go
rename to cli/pkg/sdk/tpl/filesystem.go
index 1fa992d1..6208ee87 100644
--- a/dubboctl/pkg/sdk/tpl/filesystem.go
+++ b/cli/pkg/sdk/tpl/filesystem.go
@@ -28,8 +28,8 @@ import (
)
const (
- templatesPath = "dubboctl/pkg/sdk/tpl/default"
- generatePath = "dubboctl/pkg/sdk/tpl/zz_filesystem_generated.go"
+ templatesPath = "cli/pkg/sdk/tpl/default"
+ generatePath = "cli/pkg/sdk/tpl/zz_filesystem_generated.go"
)
func main() {
diff --git a/dubboctl/pkg/sdk/tpl/zz_filesystem_generated.go
b/cli/pkg/sdk/tpl/zz_filesystem_generated.go
similarity index 100%
rename from dubboctl/pkg/sdk/tpl/zz_filesystem_generated.go
rename to cli/pkg/sdk/tpl/zz_filesystem_generated.go
diff --git a/dubboctl/pkg/util/err.go b/cli/pkg/util/err.go
similarity index 100%
rename from dubboctl/pkg/util/err.go
rename to cli/pkg/util/err.go
diff --git a/dubboctl/pkg/util/file.go b/cli/pkg/util/file.go
similarity index 100%
rename from dubboctl/pkg/util/file.go
rename to cli/pkg/util/file.go
diff --git a/dubboctl/pkg/util/fs.go b/cli/pkg/util/fs.go
similarity index 100%
rename from dubboctl/pkg/util/fs.go
rename to cli/pkg/util/fs.go
diff --git a/dubboctl/pkg/util/path.go b/cli/pkg/util/path.go
similarity index 100%
rename from dubboctl/pkg/util/path.go
rename to cli/pkg/util/path.go
diff --git a/dubboctl/pkg/util/sortedset.go b/cli/pkg/util/sortedset.go
similarity index 100%
rename from dubboctl/pkg/util/sortedset.go
rename to cli/pkg/util/sortedset.go
diff --git a/dubboctl/pkg/validate/validate.go b/cli/pkg/validate/validate.go
similarity index 97%
rename from dubboctl/pkg/validate/validate.go
rename to cli/pkg/validate/validate.go
index a6aabc76..f1aeecf5 100644
--- a/dubboctl/pkg/validate/validate.go
+++ b/cli/pkg/validate/validate.go
@@ -25,9 +25,9 @@ import (
"path/filepath"
"strings"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- operator "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/apis"
- operatorvalidate
"github.com/apache/dubbo-kubernetes/dubbooperator/pkg/apis/validation"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ operator "github.com/apache/dubbo-kubernetes/operator/pkg/apis"
+ operatorvalidate
"github.com/apache/dubbo-kubernetes/operator/pkg/apis/validation"
"github.com/apache/dubbo-kubernetes/pkg/config/validation"
"github.com/apache/dubbo-kubernetes/pkg/slices"
"github.com/hashicorp/go-multierror"
diff --git a/dubboctl/pkg/version/version.go b/cli/pkg/version/version.go
similarity index 100%
rename from dubboctl/pkg/version/version.go
rename to cli/pkg/version/version.go
diff --git a/dubbo-cni/main.go b/cni/main.go
similarity index 100%
rename from dubbo-cni/main.go
rename to cni/main.go
diff --git a/dubbocni/main.go b/dubbocni/main.go
deleted file mode 100644
index 7e512f4e..00000000
--- a/dubbocni/main.go
+++ /dev/null
@@ -1,139 +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.
-
-package main
-
-import (
- "context"
- "flag"
- "fmt"
- "io"
- "os"
- "os/signal"
- "syscall"
- "time"
-
- "github.com/apache/dubbo-kubernetes/pkg/cni"
-)
-
-func main() {
- if len(os.Args) > 1 {
- switch os.Args[1] {
- case "install":
- if err := runInstall(os.Args[2:]); err != nil {
- exitErr(err)
- }
- return
- case "uninstall":
- if err := runUninstall(os.Args[2:]); err != nil {
- exitErr(err)
- }
- return
- }
- }
-
- stdin, err := io.ReadAll(os.Stdin)
- if err != nil {
- exitErr(fmt.Errorf("read stdin: %w", err))
- }
-
- conf, err := cni.ParseNetConf(stdin)
- if err != nil {
- exitErr(err)
- }
- env := cni.EnvFromOS()
- if env.Command == "VERSION" {
- out, err := cni.Plugin{}.Run(context.Background(), env, conf)
- if err != nil {
- exitErr(err)
- }
- if _, err := os.Stdout.Write(out); err != nil {
- exitErr(fmt.Errorf("write stdout: %w", err))
- }
- return
- }
-
- plugin := cni.Plugin{
- RuleManager: cni.NewIPTablesRuleManager(conf),
- StateStore: cni.NewFileStateStore(conf.StateDirectory()),
- }
- if (env.Command == "ADD" || env.Command == "CHECK") &&
cni.EnvHasKubernetesPod(env) {
- provider, err :=
cni.NewKubernetesPodInfoProvider(conf.KubeConfigPath())
- if err != nil {
- exitErr(err)
- }
- plugin.PodInfoProvider = provider
- }
- out, err := plugin.Run(context.Background(), env, conf)
- if err != nil {
- exitErr(err)
- }
- if len(out) > 0 {
- if _, err := os.Stdout.Write(out); err != nil {
- exitErr(fmt.Errorf("write stdout: %w", err))
- }
- }
-}
-
-func runInstall(args []string) error {
- opts := cni.DefaultInstallerOptions()
- var watch bool
- var interval time.Duration
- flags := installerFlagSet("install", &opts)
- flags.BoolVar(&watch, "watch", false, "keep installer running and
refresh service account credentials")
- flags.DurationVar(&interval, "refresh-interval",
cni.DefaultInstallerInterval(), "credential refresh interval")
- if err := flags.Parse(args); err != nil {
- return err
- }
- ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt,
syscall.SIGTERM)
- defer stop()
- if watch {
- return cni.InstallLoop(ctx, opts, interval)
- }
- return cni.Install(ctx, opts)
-}
-
-func runUninstall(args []string) error {
- opts := cni.DefaultInstallerOptions()
- flags := installerFlagSet("uninstall", &opts)
- if err := flags.Parse(args); err != nil {
- return err
- }
- return cni.Uninstall(opts)
-}
-
-func installerFlagSet(name string, opts *cni.InstallerOptions) *flag.FlagSet {
- flags := flag.NewFlagSet(name, flag.ContinueOnError)
- flags.StringVar(&opts.BinDir, "bin-dir", opts.BinDir, "host CNI binary
directory")
- flags.StringVar(&opts.ConfDir, "conf-dir", opts.ConfDir, "host CNI
config directory")
- flags.StringVar(&opts.StateDir, "state-dir", opts.StateDir, "host state
directory")
- flags.StringVar(&opts.KubeConfigPath, "kubeconfig",
opts.KubeConfigPath, "host kubeconfig path used by the CNI plugin")
- flags.StringVar(&opts.TokenFile, "token-file", opts.TokenFile, "host
service account token file")
- flags.StringVar(&opts.CAFile, "ca-file", opts.CAFile, "host Kubernetes
CA file")
- flags.StringVar(&opts.ServiceAccountTokenPath, "service-account-token",
opts.ServiceAccountTokenPath, "mounted service account token source")
- flags.StringVar(&opts.ServiceAccountCAPath, "service-account-ca",
opts.ServiceAccountCAPath, "mounted service account CA source")
- flags.StringVar(&opts.APIServer, "api-server", opts.APIServer,
"Kubernetes API server URL")
- flags.StringVar(&opts.ManagedLabel, "managed-label", opts.ManagedLabel,
"label key that marks mesh-managed Pods")
- flags.StringVar(&opts.ManagedLabelValue, "managed-label-value",
opts.ManagedLabelValue, "label value that marks mesh-managed Pods")
- flags.StringVar(&opts.IPTablesPath, "iptables-path", opts.IPTablesPath,
"iptables binary used by the CNI plugin")
- flags.StringVar(&opts.IPSetPath, "ipset-path", opts.IPSetPath, "ipset
binary used by the CNI plugin")
- flags.IntVar(&opts.XServerPort, "xserver-port", opts.XServerPort,
"xserver inbound port")
- return flags
-}
-
-func exitErr(err error) {
- fmt.Fprintln(os.Stderr, err)
- os.Exit(1)
-}
diff --git a/dubbod/discovery/docker/dockerfile.dubbod
b/dubbod/discovery/docker/dockerfile.dubbod
index a1d823fa..c78991f3 100644
--- a/dubbod/discovery/docker/dockerfile.dubbod
+++ b/dubbod/discovery/docker/dockerfile.dubbod
@@ -35,7 +35,7 @@ RUN go build -v -trimpath -ldflags="-s -w" \
RUN go build -v -trimpath -ldflags="-s -w" \
-o /out/dubbo-cni \
- ./dubbo-cni/main.go
+ ./cni/main.go
FROM scratch
diff --git
a/dubbod/discovery/pkg/config/kube/gateway/deployment_controller_test.go
b/dubbod/discovery/pkg/config/kube/gateway/deployment_controller_test.go
index f9c0a34f..31f8bc1a 100644
--- a/dubbod/discovery/pkg/config/kube/gateway/deployment_controller_test.go
+++ b/dubbod/discovery/pkg/config/kube/gateway/deployment_controller_test.go
@@ -332,7 +332,7 @@ func TestGetLegacyDefaultNameKeepsOldGatewayDerivedName(t
*testing.T) {
}
func TestKubeGatewayTemplateRendersDxgateResources(t *testing.T) {
- templatePath := filepath.Join("..", "..", "..", "..", "..", "..",
"dubboinstaller", "charts", "dubbod", "files", "kube-gateway.yaml")
+ templatePath := filepath.Join("..", "..", "..", "..", "..", "..",
"manifests", "charts", "dubbod", "files", "kube-gateway.yaml")
raw, err := os.ReadFile(templatePath)
if err != nil {
t.Fatal(err)
diff --git a/dubboinstaller/charts/README.md b/manifests/charts/README.md
similarity index 100%
rename from dubboinstaller/charts/README.md
rename to manifests/charts/README.md
diff --git a/dubboinstaller/charts/base/Chart.yaml
b/manifests/charts/base/Chart.yaml
similarity index 100%
rename from dubboinstaller/charts/base/Chart.yaml
rename to manifests/charts/base/Chart.yaml
diff --git a/dubboinstaller/charts/base/README.md
b/manifests/charts/base/README.md
similarity index 100%
rename from dubboinstaller/charts/base/README.md
rename to manifests/charts/base/README.md
diff --git a/dubboinstaller/charts/base/files/crd-all.gen.yaml
b/manifests/charts/base/files/crd-all.gen.yaml
similarity index 100%
rename from dubboinstaller/charts/base/files/crd-all.gen.yaml
rename to manifests/charts/base/files/crd-all.gen.yaml
diff --git a/dubboinstaller/charts/base/templates/_helpers.tpl
b/manifests/charts/base/templates/_helpers.tpl
similarity index 100%
rename from dubboinstaller/charts/base/templates/_helpers.tpl
rename to manifests/charts/base/templates/_helpers.tpl
diff --git a/dubboinstaller/charts/base/templates/crds.yaml
b/manifests/charts/base/templates/crds.yaml
similarity index 100%
rename from dubboinstaller/charts/base/templates/crds.yaml
rename to manifests/charts/base/templates/crds.yaml
diff --git a/dubboinstaller/charts/base/templates/zzz_profile.yaml
b/manifests/charts/base/templates/zzz_profile.yaml
similarity index 100%
rename from dubboinstaller/charts/base/templates/zzz_profile.yaml
rename to manifests/charts/base/templates/zzz_profile.yaml
diff --git a/dubboinstaller/charts/base/values.yaml
b/manifests/charts/base/values.yaml
similarity index 100%
rename from dubboinstaller/charts/base/values.yaml
rename to manifests/charts/base/values.yaml
diff --git a/dubboinstaller/charts/dubbod/Chart.yaml
b/manifests/charts/dubbod/Chart.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/Chart.yaml
rename to manifests/charts/dubbod/Chart.yaml
diff --git a/dubboinstaller/charts/dubbod/README.md
b/manifests/charts/dubbod/README.md
similarity index 100%
rename from dubboinstaller/charts/dubbod/README.md
rename to manifests/charts/dubbod/README.md
diff --git a/dubboinstaller/charts/dubbod/files/grpc-engine.yaml
b/manifests/charts/dubbod/files/grpc-engine.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/files/grpc-engine.yaml
rename to manifests/charts/dubbod/files/grpc-engine.yaml
diff --git a/dubboinstaller/charts/dubbod/files/kube-gateway.yaml
b/manifests/charts/dubbod/files/kube-gateway.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/files/kube-gateway.yaml
rename to manifests/charts/dubbod/files/kube-gateway.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/clusterrole.yaml
b/manifests/charts/dubbod/templates/clusterrole.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/clusterrole.yaml
rename to manifests/charts/dubbod/templates/clusterrole.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/clusterrolebinding.yaml
b/manifests/charts/dubbod/templates/clusterrolebinding.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/clusterrolebinding.yaml
rename to manifests/charts/dubbod/templates/clusterrolebinding.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/cni-daemonset.yaml
b/manifests/charts/dubbod/templates/cni-daemonset.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/cni-daemonset.yaml
rename to manifests/charts/dubbod/templates/cni-daemonset.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/configmap-injector.yaml
b/manifests/charts/dubbod/templates/configmap-injector.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/configmap-injector.yaml
rename to manifests/charts/dubbod/templates/configmap-injector.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/configmap-values.yaml
b/manifests/charts/dubbod/templates/configmap-values.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/configmap-values.yaml
rename to manifests/charts/dubbod/templates/configmap-values.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/configmap.yaml
b/manifests/charts/dubbod/templates/configmap.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/configmap.yaml
rename to manifests/charts/dubbod/templates/configmap.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/deployment.yaml
b/manifests/charts/dubbod/templates/deployment.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/deployment.yaml
rename to manifests/charts/dubbod/templates/deployment.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/eastwest-gateway.yaml
b/manifests/charts/dubbod/templates/eastwest-gateway.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/eastwest-gateway.yaml
rename to manifests/charts/dubbod/templates/eastwest-gateway.yaml
diff --git
a/dubboinstaller/charts/dubbod/templates/mutatingwebhookconfiguration.yaml
b/manifests/charts/dubbod/templates/mutatingwebhookconfiguration.yaml
similarity index 100%
rename from
dubboinstaller/charts/dubbod/templates/mutatingwebhookconfiguration.yaml
rename to manifests/charts/dubbod/templates/mutatingwebhookconfiguration.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/service.yaml
b/manifests/charts/dubbod/templates/service.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/service.yaml
rename to manifests/charts/dubbod/templates/service.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/serviceaccount.yaml
b/manifests/charts/dubbod/templates/serviceaccount.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/serviceaccount.yaml
rename to manifests/charts/dubbod/templates/serviceaccount.yaml
diff --git
a/dubboinstaller/charts/dubbod/templates/validatingwebhookconfiguration.yaml
b/manifests/charts/dubbod/templates/validatingwebhookconfiguration.yaml
similarity index 100%
rename from
dubboinstaller/charts/dubbod/templates/validatingwebhookconfiguration.yaml
rename to manifests/charts/dubbod/templates/validatingwebhookconfiguration.yaml
diff --git a/dubboinstaller/charts/dubbod/templates/zzz_profile.yaml
b/manifests/charts/dubbod/templates/zzz_profile.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/templates/zzz_profile.yaml
rename to manifests/charts/dubbod/templates/zzz_profile.yaml
diff --git a/dubboinstaller/charts/dubbod/values.yaml
b/manifests/charts/dubbod/values.yaml
similarity index 100%
rename from dubboinstaller/charts/dubbod/values.yaml
rename to manifests/charts/dubbod/values.yaml
diff --git a/dubboinstaller/manifest.go b/manifests/manifest.go
similarity index 97%
rename from dubboinstaller/manifest.go
rename to manifests/manifest.go
index fad01484..b747cd66 100644
--- a/dubboinstaller/manifest.go
+++ b/manifests/manifest.go
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package dubboinstaller
+package manifests
import (
"embed"
diff --git a/dubboinstaller/profiles/default.yaml
b/manifests/profiles/default.yaml
similarity index 100%
rename from dubboinstaller/profiles/default.yaml
rename to manifests/profiles/default.yaml
diff --git a/dubboinstaller/profiles/empty.yaml b/manifests/profiles/empty.yaml
similarity index 100%
rename from dubboinstaller/profiles/empty.yaml
rename to manifests/profiles/empty.yaml
diff --git a/dubbooperator/cmd/cluster/install.go
b/operator/cmd/cluster/install.go
similarity index 94%
rename from dubbooperator/cmd/cluster/install.go
rename to operator/cmd/cluster/install.go
index 610f285f..f83789b5 100644
--- a/dubbooperator/cmd/cluster/install.go
+++ b/operator/cmd/cluster/install.go
@@ -18,11 +18,11 @@ package cluster
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/install"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/render"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/progress"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/install"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/render"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/progress"
"github.com/apache/dubbo-kubernetes/pkg/art"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"github.com/apache/dubbo-kubernetes/pkg/util/ptr"
diff --git a/dubbooperator/cmd/cluster/manifest.go
b/operator/cmd/cluster/manifest.go
similarity index 95%
rename from dubbooperator/cmd/cluster/manifest.go
rename to operator/cmd/cluster/manifest.go
index 97586c08..81a19d5e 100644
--- a/dubbooperator/cmd/cluster/manifest.go
+++ b/operator/cmd/cluster/manifest.go
@@ -19,10 +19,10 @@ package cluster
import (
"cmp"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/render"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/render"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"github.com/apache/dubbo-kubernetes/pkg/slices"
"github.com/spf13/cobra"
diff --git a/dubbooperator/cmd/cluster/root.go b/operator/cmd/cluster/root.go
similarity index 100%
rename from dubbooperator/cmd/cluster/root.go
rename to operator/cmd/cluster/root.go
diff --git a/dubbooperator/cmd/cluster/shared.go
b/operator/cmd/cluster/shared.go
similarity index 100%
rename from dubbooperator/cmd/cluster/shared.go
rename to operator/cmd/cluster/shared.go
diff --git a/dubbooperator/cmd/cluster/uninstall.go
b/operator/cmd/cluster/uninstall.go
similarity index 93%
rename from dubbooperator/cmd/cluster/uninstall.go
rename to operator/cmd/cluster/uninstall.go
index 9dc6ad48..36b9434d 100644
--- a/dubbooperator/cmd/cluster/uninstall.go
+++ b/operator/cmd/cluster/uninstall.go
@@ -20,11 +20,11 @@ import (
"fmt"
"os"
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/render"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/uninstall"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/progress"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/render"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/uninstall"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/progress"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"github.com/spf13/cobra"
)
diff --git a/dubbooperator/cmd/cluster/upgrade.go
b/operator/cmd/cluster/upgrade.go
similarity index 90%
rename from dubbooperator/cmd/cluster/upgrade.go
rename to operator/cmd/cluster/upgrade.go
index 976810a9..892aed0a 100644
--- a/dubbooperator/cmd/cluster/upgrade.go
+++ b/operator/cmd/cluster/upgrade.go
@@ -17,10 +17,10 @@
package cluster
import (
- "github.com/apache/dubbo-kubernetes/dubboctl/pkg/cli"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
+ "github.com/apache/dubbo-kubernetes/cli/pkg/cli"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
- // "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
+ // "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
"github.com/spf13/cobra"
)
diff --git a/dubbooperator/cmd/validation/validation.go
b/operator/cmd/validation/validation.go
similarity index 91%
rename from dubbooperator/cmd/validation/validation.go
rename to operator/cmd/validation/validation.go
index d6f80351..721c95a0 100644
--- a/dubbooperator/cmd/validation/validation.go
+++ b/operator/cmd/validation/validation.go
@@ -20,9 +20,9 @@ import (
"bytes"
"encoding/json"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/apis"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/values"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/apis"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/values"
"sigs.k8s.io/yaml"
)
diff --git a/dubbooperator/pkg/apis/proto/k8s/io/api/core/v1/generated.proto
b/operator/pkg/apis/proto/k8s/io/api/core/v1/generated.proto
similarity index 100%
rename from dubbooperator/pkg/apis/proto/k8s/io/api/core/v1/generated.proto
rename to operator/pkg/apis/proto/k8s/io/api/core/v1/generated.proto
diff --git
a/dubbooperator/pkg/apis/proto/k8s/io/apimachinery/pkg/apis/meta/v1/generated.proto
b/operator/pkg/apis/proto/k8s/io/apimachinery/pkg/apis/meta/v1/generated.proto
similarity index 100%
rename from
dubbooperator/pkg/apis/proto/k8s/io/apimachinery/pkg/apis/meta/v1/generated.proto
rename to
operator/pkg/apis/proto/k8s/io/apimachinery/pkg/apis/meta/v1/generated.proto
diff --git a/dubbooperator/pkg/apis/proto/values_types.proto
b/operator/pkg/apis/proto/values_types.proto
similarity index 97%
rename from dubbooperator/pkg/apis/proto/values_types.proto
rename to operator/pkg/apis/proto/values_types.proto
index a3c85162..02ff1bb2 100644
--- a/dubbooperator/pkg/apis/proto/values_types.proto
+++ b/operator/pkg/apis/proto/values_types.proto
@@ -22,7 +22,7 @@ package dubbo.operator.v1alpha1;
import "google/protobuf/wrappers.proto";
// Package-wide variables from generator "generated".
-option go_package = "dubbo.apache.org/dubbo/dubbooperator/pkg/apis";
+option go_package = "dubbo.apache.org/dubbo/operator/pkg/apis";
message GUIConfig {
int64 port = 1;
diff --git a/dubbooperator/pkg/apis/register.go b/operator/pkg/apis/register.go
similarity index 100%
rename from dubbooperator/pkg/apis/register.go
rename to operator/pkg/apis/register.go
diff --git a/dubbooperator/pkg/apis/types.go b/operator/pkg/apis/types.go
similarity index 100%
rename from dubbooperator/pkg/apis/types.go
rename to operator/pkg/apis/types.go
diff --git a/dubbooperator/pkg/apis/validation/validation.go
b/operator/pkg/apis/validation/validation.go
similarity index 93%
rename from dubbooperator/pkg/apis/validation/validation.go
rename to operator/pkg/apis/validation/validation.go
index 034027cb..eb5c7848 100644
--- a/dubbooperator/pkg/apis/validation/validation.go
+++ b/operator/pkg/apis/validation/validation.go
@@ -20,9 +20,9 @@ import (
"bytes"
"encoding/json"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/apis"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/values"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/apis"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/values"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"sigs.k8s.io/yaml"
)
diff --git a/dubbooperator/pkg/apis/values_types.pb.go
b/operator/pkg/apis/values_types.pb.go
similarity index 99%
rename from dubbooperator/pkg/apis/values_types.pb.go
rename to operator/pkg/apis/values_types.pb.go
index bb578791..0ad1cf1e 100644
--- a/dubbooperator/pkg/apis/values_types.pb.go
+++ b/operator/pkg/apis/values_types.pb.go
@@ -863,7 +863,7 @@ const file_values_types_proto_rawDesc = "" +
"\vIntOrString\x12\x12\n" +
"\x04type\x18\x01 \x01(\x03R\x04type\x123\n" +
"\x06intVal\x18\x02
\x01(\v2\x1b.google.protobuf.Int32ValueR\x06intVal\x124\n" +
- "\x06strVal\x18\x03
\x01(\v2\x1c.google.protobuf.StringValueR\x06strValB/Z-dubbo.apache.org/dubbo/dubbooperator/pkg/apisb\x06proto3"
+ "\x06strVal\x18\x03
\x01(\v2\x1c.google.protobuf.StringValueR\x06strValB*Z(dubbo.apache.org/dubbo/operator/pkg/apisb\x06proto3"
var (
file_values_types_proto_rawDescOnce sync.Once
diff --git a/dubbooperator/pkg/apis/values_types_json.go
b/operator/pkg/apis/values_types_json.go
similarity index 100%
rename from dubbooperator/pkg/apis/values_types_json.go
rename to operator/pkg/apis/values_types_json.go
diff --git a/dubbooperator/pkg/component/component.go
b/operator/pkg/component/component.go
similarity index 96%
rename from dubbooperator/pkg/component/component.go
rename to operator/pkg/component/component.go
index c2879cd0..2ed12f35 100644
--- a/dubbooperator/pkg/component/component.go
+++ b/operator/pkg/component/component.go
@@ -18,8 +18,8 @@ package component
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/apis"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/values"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/apis"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/values"
)
type Name string
diff --git a/dubbooperator/pkg/config/gvk.go b/operator/pkg/config/gvk.go
similarity index 100%
rename from dubbooperator/pkg/config/gvk.go
rename to operator/pkg/config/gvk.go
diff --git a/dubbooperator/pkg/helm/helm.go b/operator/pkg/helm/helm.go
similarity index 94%
rename from dubbooperator/pkg/helm/helm.go
rename to operator/pkg/helm/helm.go
index 4990cd46..ecf093f8 100644
--- a/dubbooperator/pkg/helm/helm.go
+++ b/operator/pkg/helm/helm.go
@@ -18,10 +18,10 @@ package helm
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubboinstaller"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/values"
+ "github.com/apache/dubbo-kubernetes/manifests"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/values"
"github.com/apache/dubbo-kubernetes/pkg/slices"
"helm.sh/helm/v3/pkg/chart"
"helm.sh/helm/v3/pkg/chart/loader"
@@ -52,7 +52,7 @@ func Render(namespace string, directory string, dop
values.Map) ([]manifest.Mani
return nil, nil, fmt.Errorf("failed to get values from dop:
%v", ok)
}
path := pathJoin("charts", directory)
- f := dubboinstaller.BuiltinDir("")
+ f := manifests.BuiltinDir("")
chrt, err := loadChart(f, path)
output, warnings, err := renderChart(namespace, val, chrt)
if err != nil {
diff --git a/dubbooperator/pkg/helm/path.go b/operator/pkg/helm/path.go
similarity index 100%
rename from dubbooperator/pkg/helm/path.go
rename to operator/pkg/helm/path.go
diff --git a/dubbooperator/pkg/helm/path_windows.go
b/operator/pkg/helm/path_windows.go
similarity index 100%
rename from dubbooperator/pkg/helm/path_windows.go
rename to operator/pkg/helm/path_windows.go
diff --git a/dubbooperator/pkg/install/installer.go
b/operator/pkg/install/installer.go
similarity index 94%
rename from dubbooperator/pkg/install/installer.go
rename to operator/pkg/install/installer.go
index c0b33861..f4986b6e 100644
--- a/dubbooperator/pkg/install/installer.go
+++ b/operator/pkg/install/installer.go
@@ -22,14 +22,14 @@ import (
"sync"
"time"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/component"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/uninstall"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/dmultierr"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/progress"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/values"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/component"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/uninstall"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/dmultierr"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/progress"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/values"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"github.com/apache/dubbo-kubernetes/pkg/slices"
"github.com/apache/dubbo-kubernetes/pkg/util/sets"
diff --git a/dubbooperator/pkg/install/waiter.go
b/operator/pkg/install/waiter.go
similarity index 98%
rename from dubbooperator/pkg/install/waiter.go
rename to operator/pkg/install/waiter.go
index 5291ff2d..da968e11 100644
--- a/dubbooperator/pkg/install/waiter.go
+++ b/operator/pkg/install/waiter.go
@@ -19,8 +19,8 @@ package install
import (
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/progress"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/progress"
"github.com/apache/dubbo-kubernetes/pkg/config/schema/gvk"
"github.com/apache/dubbo-kubernetes/pkg/kube"
appsv1 "k8s.io/api/apps/v1"
diff --git a/dubbooperator/pkg/manifest/manifest.go
b/operator/pkg/manifest/manifest.go
similarity index 95%
rename from dubbooperator/pkg/manifest/manifest.go
rename to operator/pkg/manifest/manifest.go
index c4d32db8..a2a7741b 100644
--- a/dubbooperator/pkg/manifest/manifest.go
+++ b/operator/pkg/manifest/manifest.go
@@ -19,8 +19,8 @@ package manifest
import (
"encoding/json"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/component"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/component"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/yaml"
)
diff --git a/dubbooperator/pkg/manifest/name.go b/operator/pkg/manifest/name.go
similarity index 100%
rename from dubbooperator/pkg/manifest/name.go
rename to operator/pkg/manifest/name.go
diff --git a/dubbooperator/pkg/render/manifest.go
b/operator/pkg/render/manifest.go
similarity index 92%
rename from dubbooperator/pkg/render/manifest.go
rename to operator/pkg/render/manifest.go
index ef448fbe..08d1815b 100644
--- a/dubbooperator/pkg/render/manifest.go
+++ b/operator/pkg/render/manifest.go
@@ -22,15 +22,15 @@ import (
"os"
"strings"
- "github.com/apache/dubbo-kubernetes/dubboinstaller"
- "github.com/apache/dubbo-kubernetes/dubbooperator/cmd/validation"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/apis"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/component"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/helm"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/values"
+ "github.com/apache/dubbo-kubernetes/manifests"
+ "github.com/apache/dubbo-kubernetes/operator/cmd/validation"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/apis"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/component"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/helm"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/values"
"github.com/apache/dubbo-kubernetes/pkg/kube"
)
@@ -128,7 +128,7 @@ func readProfile(path, profile string) (values.Map, error) {
}
func readBuiltinProfile(path, profile string) (values.Map, error) {
- fs := dubboinstaller.BuiltinDir(path)
+ fs := manifests.BuiltinDir(path)
file, err := fs.Open(fmt.Sprintf("profiles/%v.yaml", profile))
if err != nil {
return nil, fmt.Errorf("profile %q not found: %v", profile, err)
diff --git a/dubbooperator/pkg/render/manifest_test.go
b/operator/pkg/render/manifest_test.go
similarity index 99%
rename from dubbooperator/pkg/render/manifest_test.go
rename to operator/pkg/render/manifest_test.go
index 076e37b9..09b91554 100644
--- a/dubbooperator/pkg/render/manifest_test.go
+++ b/operator/pkg/render/manifest_test.go
@@ -19,7 +19,7 @@ import (
"strings"
"testing"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)
diff --git a/dubbooperator/pkg/render/postprocess.go
b/operator/pkg/render/postprocess.go
similarity index 94%
rename from dubbooperator/pkg/render/postprocess.go
rename to operator/pkg/render/postprocess.go
index d42f5121..fbd28219 100644
--- a/dubbooperator/pkg/render/postprocess.go
+++ b/operator/pkg/render/postprocess.go
@@ -20,9 +20,9 @@ import (
"encoding/json"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/component"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/values"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/component"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/values"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/yaml"
diff --git a/dubbooperator/pkg/schema/impl.go b/operator/pkg/schema/impl.go
similarity index 98%
rename from dubbooperator/pkg/schema/impl.go
rename to operator/pkg/schema/impl.go
index 81c3538a..20e75f25 100644
--- a/dubbooperator/pkg/schema/impl.go
+++ b/operator/pkg/schema/impl.go
@@ -18,7 +18,7 @@ package schema
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/config"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/config"
"github.com/hashicorp/go-multierror"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"
diff --git a/dubbooperator/pkg/uninstall/prune.go
b/operator/pkg/uninstall/prune.go
similarity index 95%
rename from dubbooperator/pkg/uninstall/prune.go
rename to operator/pkg/uninstall/prune.go
index 19a7ddf0..07563336 100644
--- a/dubbooperator/pkg/uninstall/prune.go
+++ b/operator/pkg/uninstall/prune.go
@@ -20,11 +20,11 @@ import (
"context"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/component"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/manifest"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/clog"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/ptr"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/component"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/manifest"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/clog"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/ptr"
"github.com/apache/dubbo-kubernetes/pkg/config/schema/gvk"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"github.com/apache/dubbo-kubernetes/pkg/kube/controllers"
diff --git a/dubbooperator/pkg/util/clog/clog.go
b/operator/pkg/util/clog/clog.go
similarity index 100%
rename from dubbooperator/pkg/util/clog/clog.go
rename to operator/pkg/util/clog/clog.go
diff --git a/dubbooperator/pkg/util/dmultierr/dmultierr.go
b/operator/pkg/util/dmultierr/dmultierr.go
similarity index 100%
rename from dubbooperator/pkg/util/dmultierr/dmultierr.go
rename to operator/pkg/util/dmultierr/dmultierr.go
diff --git a/dubbooperator/pkg/util/errs.go b/operator/pkg/util/errs.go
similarity index 100%
rename from dubbooperator/pkg/util/errs.go
rename to operator/pkg/util/errs.go
diff --git a/dubbooperator/pkg/util/k8s.go b/operator/pkg/util/k8s.go
similarity index 100%
rename from dubbooperator/pkg/util/k8s.go
rename to operator/pkg/util/k8s.go
diff --git a/dubbooperator/pkg/util/label.go b/operator/pkg/util/label.go
similarity index 100%
rename from dubbooperator/pkg/util/label.go
rename to operator/pkg/util/label.go
diff --git a/dubbooperator/pkg/util/parts.go b/operator/pkg/util/parts.go
similarity index 100%
rename from dubbooperator/pkg/util/parts.go
rename to operator/pkg/util/parts.go
diff --git a/dubbooperator/pkg/util/progress/progress.go
b/operator/pkg/util/progress/progress.go
similarity index 99%
rename from dubbooperator/pkg/util/progress/progress.go
rename to operator/pkg/util/progress/progress.go
index e910df00..1393147e 100644
--- a/dubbooperator/pkg/util/progress/progress.go
+++ b/operator/pkg/util/progress/progress.go
@@ -18,7 +18,7 @@ package progress
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/component"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/component"
"github.com/cheggaaa/pb/v3"
"io"
"sort"
diff --git a/dubbooperator/pkg/util/ptr/ptr.go b/operator/pkg/util/ptr/ptr.go
similarity index 100%
rename from dubbooperator/pkg/util/ptr/ptr.go
rename to operator/pkg/util/ptr/ptr.go
diff --git a/dubbooperator/pkg/values/map.go b/operator/pkg/values/map.go
similarity index 99%
rename from dubbooperator/pkg/values/map.go
rename to operator/pkg/values/map.go
index 512220fa..4c3c777a 100644
--- a/dubbooperator/pkg/values/map.go
+++ b/operator/pkg/values/map.go
@@ -19,7 +19,7 @@ package values
import (
"encoding/json"
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/ptr"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/ptr"
"path/filepath"
"reflect"
"sigs.k8s.io/yaml"
diff --git a/pkg/config/schema/kubetypes/common.go
b/pkg/config/schema/kubetypes/common.go
index 865d3fb3..a61dfc9a 100644
--- a/pkg/config/schema/kubetypes/common.go
+++ b/pkg/config/schema/kubetypes/common.go
@@ -19,7 +19,7 @@ package kubetypes
import (
"fmt"
- "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/util/ptr"
+ "github.com/apache/dubbo-kubernetes/operator/pkg/util/ptr"
"github.com/apache/dubbo-kubernetes/pkg/config"
"github.com/apache/dubbo-kubernetes/pkg/config/schema/gvk"
"github.com/apache/dubbo-kubernetes/pkg/typemap"
diff --git a/pkg/kube/inject/proxyless_test.go
b/pkg/kube/inject/proxyless_test.go
index 6b381172..400ea1bb 100644
--- a/pkg/kube/inject/proxyless_test.go
+++ b/pkg/kube/inject/proxyless_test.go
@@ -32,7 +32,7 @@ func
TestInstallerGRPCEngineTemplateInjectsDirectXDSConnection(t *testing.T) {
if !ok {
t.Fatalf("runtime.Caller() failed")
}
- templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"dubboinstaller/charts/dubbod/files/grpc-engine.yaml")
+ templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"manifests/charts/dubbod/files/grpc-engine.yaml")
templateBytes, err := os.ReadFile(templatePath)
if err != nil {
t.Fatalf("failed to read grpc-engine.yaml: %v", err)
@@ -102,7 +102,7 @@ func
TestInstallerGRPCEngineTemplateUsesGenerateNameForDeploymentPods(t *testing
if !ok {
t.Fatalf("runtime.Caller() failed")
}
- templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"dubboinstaller/charts/dubbod/files/grpc-engine.yaml")
+ templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"manifests/charts/dubbod/files/grpc-engine.yaml")
templateBytes, err := os.ReadFile(templatePath)
if err != nil {
t.Fatalf("failed to read grpc-engine.yaml: %v", err)
@@ -384,7 +384,7 @@ func
TestInstallerGRPCEngineTemplateConfiguresXDSClientForDubbodImage(t *testing
if !ok {
t.Fatalf("runtime.Caller() failed")
}
- templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"dubboinstaller/charts/dubbod/files/grpc-engine.yaml")
+ templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"manifests/charts/dubbod/files/grpc-engine.yaml")
templateBytes, err := os.ReadFile(templatePath)
if err != nil {
t.Fatalf("failed to read grpc-engine.yaml: %v", err)
@@ -461,7 +461,7 @@ func
TestInstallerGRPCEngineTemplateDoesNotConfigureXDSClientForNonDubbodImage(t
if !ok {
t.Fatalf("runtime.Caller() failed")
}
- templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"dubboinstaller/charts/dubbod/files/grpc-engine.yaml")
+ templatePath := filepath.Join(filepath.Dir(currentFile), "../../..",
"manifests/charts/dubbod/files/grpc-engine.yaml")
templateBytes, err := os.ReadFile(templatePath)
if err != nil {
t.Fatalf("failed to read grpc-engine.yaml: %v", err)
diff --git a/pkg/kube/inject/webhook.go b/pkg/kube/inject/webhook.go
index 71114d8c..08f6fd33 100644
--- a/pkg/kube/inject/webhook.go
+++ b/pkg/kube/inject/webhook.go
@@ -33,7 +33,7 @@ import (
kubeApiAdmissionv1beta1 "k8s.io/api/admission/v1beta1"
"github.com/apache/dubbo-kubernetes/dubbod/discovery/pkg/model"
- opconfig "github.com/apache/dubbo-kubernetes/dubbooperator/pkg/apis"
+ opconfig "github.com/apache/dubbo-kubernetes/operator/pkg/apis"
"github.com/apache/dubbo-kubernetes/pkg/config/constants"
"github.com/apache/dubbo-kubernetes/pkg/kube"
"github.com/apache/dubbo-kubernetes/pkg/kube/multicluster"
