You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2023/03/03 04:37:20 UTC
[dubbo-admin] branch refactor-with-go updated: Refactor go struct (#1008)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/refactor-with-go by this push:
new 1195b4d Refactor go struct (#1008)
1195b4d is described below
commit 1195b4dd0da7ca251b2ee9480b9fa16361eb452e
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Mar 3 12:37:14 2023 +0800
Refactor go struct (#1008)
---
.../{deploy-ca.yml => deploy-authority.yml} | 7 +-
.github/workflows/format.yml | 10 +-
.github/workflows/lint.yml | 36 +--
.github/workflows/unit-test.yml | 55 +----
.gitignore | 2 +
ca/go.mod | 78 ------
ca/go.sum | 265 ---------------------
{dubbo-admin-server => cmd/admin}/README.md | 4 +-
dubbo-admin-server/admin.go => cmd/admin/main.go | 6 +-
{ca => cmd/authority}/main.go | 6 +-
codestyle/checkstyle.xml | 25 --
codestyle/dubbo_codestyle_for_idea.xml | 33 ---
.../admin}/.run/AdminRun.run.xml | 0
.../admin}/conf/dubboadmin.yml | 0
{charts => deploy/charts}/admin-stack/.helmignore | 0
{charts => deploy/charts}/admin-stack/Chart.yaml | 0
{charts => deploy/charts}/admin-stack/README.md | 0
.../admin-stack/charts/dubbo-admin/.helmignore | 0
.../admin-stack/charts/dubbo-admin/Chart.yaml | 0
.../charts/dubbo-admin/templates/NOTES.txt | 0
.../charts/dubbo-admin/templates/_helpers.tpl | 0
.../charts/dubbo-admin/templates/clusterrole.yaml | 0
.../dubbo-admin/templates/clusterrolebinding.yaml | 0
.../charts/dubbo-admin/templates/deployment.yaml | 0
.../charts/dubbo-admin/templates/ingress.yaml | 0
.../dubbo-admin/templates/networkpolicy.yaml | 0
.../charts/dubbo-admin/templates/pdb.yaml | 0
.../charts/dubbo-admin/templates/psp.yaml | 0
.../charts/dubbo-admin/templates/pvc.yaml | 0
.../charts/dubbo-admin/templates/role.yaml | 0
.../charts/dubbo-admin/templates/rolebinding.yaml | 0
.../charts/dubbo-admin/templates/secret.yaml | 0
.../dubbo-admin/templates/serviceaccount.yaml | 0
.../charts/dubbo-admin/templates/svc-headless.yaml | 0
.../charts/dubbo-admin/templates/svc.yaml | 0
.../dubbo-admin/templates/tests/test-role.yaml | 0
.../templates/tests/test-rolebinding.yaml | 0
.../dubbo-admin/templates/tests/test-secret.yaml | 0
.../templates/tests/test-serviceaccount.yaml | 0
.../charts/dubbo-admin/templates/tests/test.yaml | 0
.../admin-stack/charts/dubbo-admin/values.yaml | 0
.../charts}/admin-stack/charts/grafana/.helmignore | 0
.../charts}/admin-stack/charts/grafana/Chart.yaml | 0
.../grafana/dashboards/custom-dashboard.json | 0
.../charts/grafana/templates/_helpers.tpl | 0
.../admin-stack/charts/grafana/templates/_pod.tpl | 0
.../charts/grafana/templates/clusterrole.yaml | 0
.../grafana/templates/clusterrolebinding.yaml | 0
.../templates/configmap-dashboard-provider.yaml | 0
.../charts/grafana/templates/configmap.yaml | 0
.../templates/dashboards-json-configmap.yaml | 0
.../charts/grafana/templates/deployment.yaml | 0
.../charts/grafana/templates/headless-service.yaml | 0
.../charts/grafana/templates/ingress.yaml | 0
.../charts/grafana/templates/networkpolicy.yaml | 0
.../grafana/templates/poddisruptionbudget.yaml | 0
.../admin-stack/charts/grafana/templates/pvc.yaml | 0
.../admin-stack/charts/grafana/templates/role.yaml | 0
.../charts/grafana/templates/rolebinding.yaml | 0
.../charts/grafana/templates/secret-env.yaml | 0
.../charts/grafana/templates/secret.yaml | 0
.../charts/grafana/templates/service.yaml | 0
.../charts/grafana/templates/serviceaccount.yaml | 0
.../charts/grafana/templates/statefulset.yaml | 0
.../charts}/admin-stack/charts/grafana/values.yaml | 0
.../charts}/admin-stack/charts/nacos/.helmignore | 0
.../charts}/admin-stack/charts/nacos/Chart.yaml | 0
.../admin-stack/charts/nacos/templates/NOTES.txt | 0
.../charts/nacos/templates/_helpers.tpl | 0
.../charts/nacos/templates/configmap.yaml | 0
.../charts/nacos/templates/networkpolicy.yaml | 0
.../admin-stack/charts/nacos/templates/pdb.yaml | 0
.../charts/nacos/templates/statefulset.yaml | 0
.../charts/nacos/templates/svc-headless.yaml | 0
.../admin-stack/charts/nacos/templates/svc.yaml | 0
.../charts}/admin-stack/charts/nacos/values.yaml | 0
.../admin-stack/charts/zookeeper/.helmignore | 0
.../admin-stack/charts/zookeeper/Chart.yaml | 0
.../charts/zookeeper/templates/NOTES.txt | 0
.../charts/zookeeper/templates/_helpers.tpl | 0
.../charts/zookeeper/templates/configmap.yaml | 0
.../charts/zookeeper/templates/networkpolicy.yaml | 0
.../charts/zookeeper/templates/pdb.yaml | 0
.../charts/zookeeper/templates/statefulset.yaml | 0
.../charts/zookeeper/templates/svc-headless.yaml | 0
.../charts/zookeeper/templates/svc.yaml | 0
.../admin-stack/charts/zookeeper/values.yaml | 0
.../charts}/admin-stack/templates/tpl/_helpers.tpl | 0
.../charts}/admin-stack/templates/tpl/_ingress.tpl | 0
.../admin-stack/templates/tpl/_kubeversions.tpl | 0
.../admin-stack/templates/tpl/_storages.tpl | 0
.../admin-stack/templates/tpl/_tplvalues.tpl | 0
.../admin-stack/templates/tpl/_versions.tpl | 0
{charts => deploy/charts}/admin-stack/values.yaml | 0
{ca/deploy => deploy}/crd.yaml | 0
{ca/deploy => deploy}/deployment.yml | 0
{ca => deploy/docker/authority}/Dockerfile | 8 +-
.../example-peerauthentication.yaml | 0
.../kubernetes}/dubbo-admin/configmap.yaml | 0
.../kubernetes}/dubbo-admin/deployment.yaml | 0
.../kubernetes}/dubbo-admin/pv.yaml | 0
.../kubernetes}/dubbo-admin/pvc.yaml | 0
.../kubernetes}/dubbo-admin/rbac.yaml | 0
.../kubernetes}/dubbo-admin/service.yaml | 0
.../kubernetes}/dubbo-admin/storageclass.yaml | 0
.../kubernetes}/grafana/configmap.yaml | 0
.../kubernetes}/grafana/rbac.yaml | 0
.../kubernetes}/grafana/secret.yaml | 0
.../kubernetes}/grafana/service.yaml | 0
.../kubernetes}/grafana/statefulset.yaml | 0
.../kubernetes}/grafana/storage.yaml | 0
{kubernetes => deploy/kubernetes}/nacos/pv.yaml | 0
{kubernetes => deploy/kubernetes}/nacos/pvc.yaml | 0
.../kubernetes}/nacos/service.yaml | 0
.../kubernetes}/nacos/statefulset.yaml | 0
.../kubernetes}/nacos/storageclass.yaml | 0
.../kubernetes}/prometheus/configmap.yaml | 0
.../kubernetes}/prometheus/pv.yaml | 0
.../kubernetes}/prometheus/pvc.yaml | 0
.../kubernetes}/prometheus/rbac.yaml | 0
.../kubernetes}/prometheus/service.yaml | 0
.../kubernetes}/prometheus/statefulset.yaml | 0
.../kubernetes}/prometheus/storageclass.yaml | 0
.../kubernetes}/zookeeper/configmap.yaml | 0
.../kubernetes}/zookeeper/pv.yaml | 0
.../kubernetes}/zookeeper/pvc.yaml | 0
.../kubernetes}/zookeeper/service.yaml | 0
.../kubernetes}/zookeeper/statefulset.yaml | 0
.../kubernetes}/zookeeper/storageclass.yaml | 0
{ca/deploy => deploy}/permission.yml | 0
docker/0.1.0/Dockerfile | 25 --
docker/0.2.0/Dockerfile | 25 --
docker/0.3.0/Dockerfile | 30 ---
docker/0.3.0/Dockerfile.test | 23 --
docker/0.3.0/docker-compose.test.yml | 33 ---
docker/0.3.0/test.sh | 34 ---
docker/0.4.0/Dockerfile | 30 ---
docker/0.4.0/Dockerfile.test | 23 --
docker/0.4.0/docker-compose.test.yml | 33 ---
docker/0.4.0/test.sh | 34 ---
docker/0.5.0/Dockerfile | 30 ---
docker/0.5.0/Dockerfile.test | 23 --
docker/0.5.0/docker-compose.test.yml | 33 ---
docker/0.5.0/test.sh | 34 ---
docker/entrypoint.sh | 3 -
docker/latest/Dockerfile | 31 ---
docker/stack.yml | 45 ----
{doc => docs}/images/ide_configuration.png | Bin
{doc => docs}/images/index.png | Bin
{doc => docs}/images/logo.png | Bin
{doc => docs}/images/profile-eclipse.jpg | Bin
{doc => docs}/images/profile-idea.jpg | Bin
dubbo-admin-server/pkg/model/entity.go | 6 -
dubbo-admin-server/pkg/model/provider.go | 22 --
dubbo-admin-server/pkg/model/registry_source.go | 11 -
.../pkg/services/provider_service.go | 8 -
dubbo-admin-server/pkg/util/sync_utils.go | 29 ---
dubbo-admin-server/go.mod => go.mod | 54 ++++-
dubbo-admin-server/go.sum => go.sum | 95 +++++++-
.../admin}/cache/interface_registry_cache.go | 0
.../pkg => pkg/admin}/config/address_config.go | 0
.../pkg => pkg/admin}/config/config.go | 4 +-
.../pkg => pkg/admin}/constant/const.go | 0
.../pkg => pkg/admin}/handlers/service.go | 2 +-
.../pkg => pkg/admin}/imports/imports.go | 0
.../v1beta1/doc.go => pkg/admin/model/entity.go | 12 +-
.../admin/model/provider.go | 37 +--
.../doc.go => pkg/admin/model/registry_source.go | 17 +-
{dubbo-admin-server => pkg/admin}/router/router.go | 2 +-
.../admin/services/provider_service.go | 13 +-
.../admin}/services/provider_service_impl.go | 23 +-
.../admin}/services/registry_service_sync.go | 6 +-
{dubbo-admin-server/pkg => pkg/admin}/util/Tool.go | 0
.../admin}/util/base_service_metadata.go | 0
{dubbo-admin-server/pkg => pkg/admin}/util/hash.go | 0
pkg/admin/util/sync_utils.go | 44 ++++
.../apis/dubbo.apache.org/v1beta1/doc.go | 0
.../apis/dubbo.apache.org/v1beta1/register.go | 0
.../apis/dubbo.apache.org/v1beta1/type.go | 0
.../v1beta1/zz_generated.deepcopy.go | 0
{ca/pkg => pkg/authority}/cert/storage.go | 4 +-
{ca/pkg => pkg/authority}/cert/storage_test.go | 4 +-
{ca/pkg => pkg/authority}/cert/util.go | 2 +-
{ca/pkg => pkg/authority}/cert/util_test.go | 0
{ca/pkg => pkg/authority}/config/options.go | 0
.../v1beta1/authenticationpolicy.go | 0
.../v1beta1/authenticationpolicyextend.go | 0
.../v1beta1/authenticationpolicyrule.go | 0
.../v1beta1/authenticationpolicysource.go | 0
.../v1beta1/authenticationpolicyspec.go | 0
.../v1beta1/authenticationpolicytarget.go | 0
.../v1beta1/authorizationpolicy.go | 0
.../v1beta1/authorizationpolicycondition.go | 0
.../v1beta1/authorizationpolicyextend.go | 0
.../v1beta1/authorizationpolicymatch.go | 0
.../v1beta1/authorizationpolicyrule.go | 0
.../v1beta1/authorizationpolicysource.go | 0
.../v1beta1/authorizationpolicyspec.go | 0
.../v1beta1/authorizationpolicytarget.go | 0
.../applyconfiguration/internal/internal.go | 0
.../generated/applyconfiguration/utils.go | 32 +--
.../generated/clientset/versioned/clientset.go | 2 +-
.../versioned/fake/clientset_generated.go | 6 +-
.../generated/clientset/versioned/fake/doc.go | 0
.../generated/clientset/versioned/fake/register.go | 2 +-
.../generated/clientset/versioned/scheme/doc.go | 0
.../clientset/versioned/scheme/register.go | 2 +-
.../v1beta1/authenticationpolicy.go | 6 +-
.../v1beta1/authorizationpolicy.go | 6 +-
.../typed/dubbo.apache.org/v1beta1/doc.go | 0
.../v1beta1/dubbo.apache.org_client.go | 4 +-
.../typed/dubbo.apache.org/v1beta1/fake/doc.go | 0
.../v1beta1/fake/fake_authenticationpolicy.go | 50 ++--
.../v1beta1/fake/fake_authorizationpolicy.go | 50 ++--
.../v1beta1/fake/fake_dubbo.apache.org_client.go | 6 +-
.../v1beta1/generated_expansion.go | 0
.../externalversions/dubbo.apache.org/interface.go | 4 +-
.../v1beta1/authenticationpolicy.go | 8 +-
.../v1beta1/authorizationpolicy.go | 8 +-
.../dubbo.apache.org/v1beta1/interface.go | 2 +-
.../informers/externalversions/factory.go | 6 +-
.../informers/externalversions/generic.go | 2 +-
.../internalinterfaces/factory_interfaces.go | 2 +-
.../v1beta1/authenticationpolicy.go | 22 +-
.../v1beta1/authorizationpolicy.go | 22 +-
.../v1beta1/expansion_generated.go | 0
{ca/pkg => pkg/authority}/k8s/client.go | 14 +-
{ca/pkg => pkg/authority}/k8s/controller.go | 70 +++---
{ca/pkg => pkg/authority}/k8s/controller_test.go | 0
{ca/pkg => pkg/authority}/logger/log.go | 0
{ca/pkg => pkg/authority}/patch/javasdk.go | 4 +-
{ca/pkg => pkg/authority}/patch/javasdk_test.go | 2 +-
.../authority}/rule/authentication/definition.go | 0
.../authority}/rule/authentication/handler.go | 0
.../authority}/rule/authorization/definition.go | 0
.../authority}/rule/authorization/handler.go | 0
{ca/pkg => pkg/authority}/security/server.go | 38 +--
{ca/pkg => pkg/authority}/security/server_test.go | 28 +--
{ca/pkg => pkg/authority}/v1alpha1/ca.pb.go | 0
{ca/pkg => pkg/authority}/v1alpha1/ca.proto | 0
{ca/pkg => pkg/authority}/v1alpha1/ca_grpc.pb.go | 0
{ca/pkg => pkg/authority}/v1alpha1/ca_impl.go | 14 +-
{ca/pkg => pkg/authority}/v1alpha1/ca_impl_test.go | 32 +--
{ca/pkg => pkg/authority}/webhook/server.go | 4 +-
244 files changed, 502 insertions(+), 1365 deletions(-)
diff --git a/.github/workflows/deploy-ca.yml b/.github/workflows/deploy-authority.yml
similarity index 82%
rename from .github/workflows/deploy-ca.yml
rename to .github/workflows/deploy-authority.yml
index b850472..7fc6bba 100644
--- a/.github/workflows/deploy-ca.yml
+++ b/.github/workflows/deploy-authority.yml
@@ -9,8 +9,9 @@ jobs:
docker:
name: Doploy on ${{matrix.platform}}
runs-on: ubuntu-latest
- matrix:
- platform: [linux/amd64, linux/arm64/v8, linux/arm/v7, linux/arm/v6]
+ strategy:
+ matrix:
+ platform: [linux/amd64, linux/arm64/v8, linux/arm/v7, linux/arm/v6]
steps:
- uses: actions/checkout@v2
- name: Set up QEMU
@@ -26,6 +27,6 @@ jobs:
uses: docker/build-push-action@v2
with:
push: true
- context: ca/
+ file: deploy/docker/authority/Dockerfile
tags: apache/dubbo-ca:dev
platforms: ${{matrix.platform}}
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 9abb25e..80d15ed 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -45,16 +45,8 @@ jobs:
${{ runner.os }}-go-
- name: Get dependencies
run: |
- cd ca
- go get -v -t -d ./...
- cd ../dubbo-admin-server
go get -v -t -d ./...
- name: Go Fmt
run: |
- cd ca
- go fmt ./...
- cd ../dubbo-admin-server
- go fmt ./...
- cd ..
- git status && [[ -z `git status -s` ]]
+ go fmt ./... && git status && [[ -z `git status -s` ]]
# diff -u <(echo -n) <(gofmt -d -s .)
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index fd72e5e..f74aa7d 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -23,36 +23,8 @@ on:
pull_request:
jobs:
-
- lint-authority:
- name: Lint Authority
- runs-on: ubuntu-latest
- steps:
- - name: Set up Go 1.x
- uses: actions/setup-go@v2
- id: go
- - name: Check out code into the Go module directory
- uses: actions/checkout@v2
- - name: Cache dependencies
- uses: actions/cache@v2
- with:
- # Cache
- path: ~/go/pkg/mod
- # Cache key
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
- restore-keys: |
- ${{ runner.os }}-go-
- - name: Get dependencies
- run: |
- cd ca && go get -v -t -d ./...
- - name: Install go ci lint
- run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0
- - name: Run Linter
- run: cd ca && GO111MODULE=on $(go env GOPATH)/bin/golangci-lint run --timeout=30m -v --disable-all --enable=govet --enable=staticcheck --enable=ineffassign --enable=misspell
-
- lint-admin-server:
- name: Lint Admin Server
+ lint:
+ name: Lint
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.x
@@ -72,8 +44,8 @@ jobs:
${{ runner.os }}-go-
- name: Get dependencies
run: |
- cd dubbo-admin-server && go get -v -t -d ./...
+ go get -v -t -d ./...
- name: Install go ci lint
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0
- name: Run Linter
- run: cd dubbo-admin-server && GO111MODULE=on $(go env GOPATH)/bin/golangci-lint run --timeout=30m -v --disable-all --enable=govet --enable=staticcheck --enable=ineffassign --enable=misspell
+ run: GO111MODULE=on $(go env GOPATH)/bin/golangci-lint run --timeout=30m -v --disable-all --enable=govet --enable=staticcheck --enable=ineffassign --enable=misspell
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 945fb38..43c86e3 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -23,8 +23,8 @@ on:
pull_request:
jobs:
- test-authority:
- name: Go Test Dubbo Authority
+ unit-test:
+ name: Go Test
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.x
@@ -44,62 +44,15 @@ jobs:
${{ runner.os }}-go-
- name: Get dependencies
run: |
- cd ca && go get -v -t -d ./...
+ go get -v -t -d ./...
- name: Go Test
run: |
- cd ca && go mod vendor && go test ./... -gcflags=-l -coverprofile=coverage.txt -covermode=atomic
+ go mod vendor && go test ./... -gcflags=-l -coverprofile=coverage.txt -covermode=atomic
- name: "Upload test result"
if: always()
uses: actions/upload-artifact@v3
with:
name: test-coverage
path: "**/coverage.txt"
-
- test-admin-server:
- name: Go Test Dubbo Admin Server
- runs-on: ubuntu-latest
- steps:
- - name: Set up Go 1.x
- uses: actions/setup-go@v2
- id: go
- - name: Check out code into the Go module directory
- uses: actions/checkout@v2
- - name: Cache dependencies
- uses: actions/cache@v2
- with:
- # Cache
- path: ~/go/pkg/mod
- # Cache key
- key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- # An ordered list of keys to use for restoring the cache if no cache hit occurred for key
- restore-keys: |
- ${{ runner.os }}-go-
- - name: Get dependencies
- run: |
- cd dubbo-admin-server && go get -v -t -d ./...
- - name: Go Test
- run: |
- cd dubbo-admin-server && go mod vendor && go test ./... -gcflags=-l -coverprofile=coverage.txt -covermode=atomic
- - name: "Upload test result"
- if: always()
- uses: actions/upload-artifact@v3
- with:
- name: test-coverage
- path: "**/coverage.txt"
-
- upload-coverage:
- name: Upload coverage
- runs-on: ubuntu-latest
- needs: [test-authority, test-admin-server]
- steps:
- - name: Set up Go 1.x
- uses: actions/setup-go@v2
- id: go
- - name: Check out code into the Go module directory
- uses: actions/checkout@v2
- - name: "Download test result"
- uses: actions/download-artifact@v3
- with:
- name: test-coverage
- name: Coverage
run: bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 1ed837f..68e78d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ dubbo-admin-server/target
dubbo-admin-ui/dist
dubbo-admin-ui/node
dubbo-admin-ui/node-modules
+
+coverage.txt
\ No newline at end of file
diff --git a/ca/go.mod b/ca/go.mod
deleted file mode 100644
index 928e18b..0000000
--- a/ca/go.mod
+++ /dev/null
@@ -1,78 +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.
-
-module github.com/apache/dubbo-admin/ca
-
-go 1.19
-
-require (
- github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
- github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24
- go.uber.org/zap v1.24.0
- golang.org/x/net v0.7.0
- google.golang.org/grpc v1.53.0
- google.golang.org/protobuf v1.28.1
- k8s.io/api v0.26.1
- k8s.io/apimachinery v0.26.1
- k8s.io/client-go v0.26.1
- sigs.k8s.io/structured-merge-diff/v4 v4.2.3
-)
-
-require (
- github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/emicklei/go-restful/v3 v3.9.0 // indirect
- github.com/evanphx/json-patch v4.12.0+incompatible // indirect
- github.com/go-logr/logr v1.2.3 // indirect
- github.com/go-openapi/jsonpointer v0.19.5 // indirect
- github.com/go-openapi/jsonreference v0.20.0 // indirect
- github.com/go-openapi/swag v0.19.14 // indirect
- github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
- github.com/golang/protobuf v1.5.2 // indirect
- github.com/google/gnostic v0.5.7-v3refs // indirect
- github.com/google/go-cmp v0.5.9 // indirect
- github.com/google/gofuzz v1.1.0 // indirect
- github.com/imdario/mergo v0.3.6 // indirect
- github.com/josharian/intern v1.0.0 // indirect
- github.com/json-iterator/go v1.1.12 // indirect
- github.com/kr/pretty v0.3.0 // indirect
- github.com/mailru/easyjson v0.7.6 // indirect
- github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- github.com/modern-go/reflect2 v1.0.2 // indirect
- github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
- github.com/pkg/errors v0.9.1 // indirect
- github.com/rogpeppe/go-internal v1.8.0 // indirect
- github.com/spf13/pflag v1.0.5 // indirect
- github.com/stretchr/testify v1.8.2 // indirect
- go.uber.org/atomic v1.10.0 // indirect
- go.uber.org/multierr v1.9.0 // indirect
- golang.org/x/oauth2 v0.4.0 // indirect
- golang.org/x/sys v0.5.0 // indirect
- golang.org/x/term v0.5.0 // indirect
- golang.org/x/text v0.7.0 // indirect
- golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
- google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 // indirect
- gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
- gopkg.in/inf.v0 v0.9.1 // indirect
- gopkg.in/yaml.v2 v2.4.0 // indirect
- gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/klog/v2 v2.80.1 // indirect
- k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
- k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
- sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
- sigs.k8s.io/yaml v1.3.0 // indirect
-)
diff --git a/ca/go.sum b/ca/go.sum
deleted file mode 100644
index 3522048..0000000
--- a/ca/go.sum
+++ /dev/null
@@ -1,265 +0,0 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
-github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
-github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
-github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
-github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
-github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
-github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 h1:uYuGXJBAi1umT+ZS4oQJUgKtfXCAYTR+n9zw1ViT0vA=
-github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
-github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
-go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
-golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 h1:muK+gVBJBfFb4SejshDBlN2/UgxCCOKH9Y34ljqEGOc=
-google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
-google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
-k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
-k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
-k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
-k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
-k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
-k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
-k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
-k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
-k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
-k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
-sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
-sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/dubbo-admin-server/README.md b/cmd/admin/README.md
similarity index 94%
rename from dubbo-admin-server/README.md
rename to cmd/admin/README.md
index 6fac3ae..17cf483 100644
--- a/dubbo-admin-server/README.md
+++ b/cmd/admin/README.md
@@ -25,12 +25,12 @@ git clone -b develop https://github.com/apache/dubbo-admin.git
- `cd dubbo-admin-distribution/target & java -jar dubbo-admin-{the-package-version}.jar`
5. Visit `http://localhost:38080`, default username and password are `root`
-可以在此查看 [Java 版本的更多启动方式](../README.md)。
+可以在此查看 [Java 版本的更多启动方式](../../README.md)。
### Go
Once open this project in GoLand, a pre-configured Admin runnable task can be found from "Run Configuration" pop up menu as shown below.
-
+
Click the `Run`button and you can get the Admin process started locally. But before doing that, you might need to change the configuration file located at `dubbo-admin/dubbo-admin-server/pkg/conf/dubboadmin.yml`to make sure `registry.address` is pointed to the zookeeper server you started before.
diff --git a/dubbo-admin-server/admin.go b/cmd/admin/main.go
similarity index 87%
rename from dubbo-admin-server/admin.go
rename to cmd/admin/main.go
index 5cf3fcd..72191b6 100644
--- a/dubbo-admin-server/admin.go
+++ b/cmd/admin/main.go
@@ -18,9 +18,9 @@
package main
import (
- "admin/pkg/config"
- "admin/pkg/services"
- "admin/router"
+ "github.com/apache/dubbo-admin/pkg/admin/config"
+ "github.com/apache/dubbo-admin/pkg/admin/router"
+ "github.com/apache/dubbo-admin/pkg/admin/services"
)
func main() {
diff --git a/ca/main.go b/cmd/authority/main.go
similarity index 91%
rename from ca/main.go
rename to cmd/authority/main.go
index d6fb2b8..af4112f 100644
--- a/ca/main.go
+++ b/cmd/authority/main.go
@@ -16,9 +16,9 @@
package main
import (
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
- "github.com/apache/dubbo-admin/ca/pkg/security"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
+ "github.com/apache/dubbo-admin/pkg/authority/security"
"os"
"os/signal"
"syscall"
diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml
deleted file mode 100644
index 9c7581b..0000000
--- a/codestyle/checkstyle.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
- "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
-
-<module name="Checker">
- <property name="charset" value="UTF-8"/>
- <property name="fileExtensions" value="java"/>
-
- <!-- TreeWalker Checks -->
- <module name="TreeWalker">
- <module name="SuppressWarningsHolder" />
-
- <module name="AvoidStarImport"/>
- <module name="AvoidEscapedUnicodeCharacters">
- <property name="allowEscapesForControlCharacters" value="true"/>
- <property name="allowByTailComment" value="true"/>
- <property name="allowNonPrintableEscapes" value="true"/>
- </module>
- <module name="NoLineWrap"/>
- <module name="OuterTypeFilename"/>
- <module name="UnusedImports"/>
-
- </module>
-</module>
diff --git a/codestyle/dubbo_codestyle_for_idea.xml b/codestyle/dubbo_codestyle_for_idea.xml
deleted file mode 100644
index 1cbbe37..0000000
--- a/codestyle/dubbo_codestyle_for_idea.xml
+++ /dev/null
@@ -1,33 +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.
- -->
-
-<code_scheme name="dubbo_codestyle">
- <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99"/>
- <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99"/>
- <option name="IMPORT_LAYOUT_TABLE">
- <value>
- <package name="org.apache.dubbo.admin" withSubpackages="true" static="false"/>
- <emptyLine/>
- <package name="" withSubpackages="true" static="false"/>
- <emptyLine/>
- <package name="javax" withSubpackages="true" static="false"/>
- <package name="java" withSubpackages="true" static="false"/>
- <emptyLine/>
- <package name="" withSubpackages="true" static="true"/>
- </value>
- </option>
-</code_scheme>
diff --git a/dubbo-admin-server/.run/AdminRun.run.xml b/deploy/admin/.run/AdminRun.run.xml
similarity index 100%
rename from dubbo-admin-server/.run/AdminRun.run.xml
rename to deploy/admin/.run/AdminRun.run.xml
diff --git a/dubbo-admin-server/conf/dubboadmin.yml b/deploy/admin/conf/dubboadmin.yml
similarity index 100%
rename from dubbo-admin-server/conf/dubboadmin.yml
rename to deploy/admin/conf/dubboadmin.yml
diff --git a/charts/admin-stack/.helmignore b/deploy/charts/admin-stack/.helmignore
similarity index 100%
rename from charts/admin-stack/.helmignore
rename to deploy/charts/admin-stack/.helmignore
diff --git a/charts/admin-stack/Chart.yaml b/deploy/charts/admin-stack/Chart.yaml
similarity index 100%
rename from charts/admin-stack/Chart.yaml
rename to deploy/charts/admin-stack/Chart.yaml
diff --git a/charts/admin-stack/README.md b/deploy/charts/admin-stack/README.md
similarity index 100%
rename from charts/admin-stack/README.md
rename to deploy/charts/admin-stack/README.md
diff --git a/charts/admin-stack/charts/dubbo-admin/.helmignore b/deploy/charts/admin-stack/charts/dubbo-admin/.helmignore
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/.helmignore
rename to deploy/charts/admin-stack/charts/dubbo-admin/.helmignore
diff --git a/charts/admin-stack/charts/dubbo-admin/Chart.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/Chart.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/Chart.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/Chart.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/NOTES.txt b/deploy/charts/admin-stack/charts/dubbo-admin/templates/NOTES.txt
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/NOTES.txt
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/NOTES.txt
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl b/deploy/charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/_helpers.tpl
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/clusterrole.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/clusterrole.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/clusterrole.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/clusterrole.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/clusterrolebinding.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/clusterrolebinding.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/clusterrolebinding.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/clusterrolebinding.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/deployment.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/deployment.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/deployment.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/deployment.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/ingress.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/ingress.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/ingress.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/ingress.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/networkpolicy.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/networkpolicy.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/networkpolicy.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/networkpolicy.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/pdb.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/pdb.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/pdb.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/pdb.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/psp.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/psp.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/psp.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/psp.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/pvc.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/pvc.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/pvc.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/pvc.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/role.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/role.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/role.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/role.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/rolebinding.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/secret.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/secret.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/secret.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/secret.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/serviceaccount.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/serviceaccount.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/serviceaccount.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/serviceaccount.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/svc-headless.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/svc-headless.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/svc-headless.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/svc-headless.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/svc.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/svc.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/svc.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/svc.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/tests/test-role.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-role.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/tests/test-role.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-role.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/tests/test-rolebinding.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-rolebinding.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/tests/test-rolebinding.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-rolebinding.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/tests/test-secret.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-secret.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/tests/test-secret.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-secret.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/tests/test-serviceaccount.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-serviceaccount.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/tests/test-serviceaccount.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test-serviceaccount.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/templates/tests/test.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/templates/tests/test.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/templates/tests/test.yaml
diff --git a/charts/admin-stack/charts/dubbo-admin/values.yaml b/deploy/charts/admin-stack/charts/dubbo-admin/values.yaml
similarity index 100%
rename from charts/admin-stack/charts/dubbo-admin/values.yaml
rename to deploy/charts/admin-stack/charts/dubbo-admin/values.yaml
diff --git a/charts/admin-stack/charts/grafana/.helmignore b/deploy/charts/admin-stack/charts/grafana/.helmignore
similarity index 100%
rename from charts/admin-stack/charts/grafana/.helmignore
rename to deploy/charts/admin-stack/charts/grafana/.helmignore
diff --git a/charts/admin-stack/charts/grafana/Chart.yaml b/deploy/charts/admin-stack/charts/grafana/Chart.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/Chart.yaml
rename to deploy/charts/admin-stack/charts/grafana/Chart.yaml
diff --git a/charts/admin-stack/charts/grafana/dashboards/custom-dashboard.json b/deploy/charts/admin-stack/charts/grafana/dashboards/custom-dashboard.json
similarity index 100%
rename from charts/admin-stack/charts/grafana/dashboards/custom-dashboard.json
rename to deploy/charts/admin-stack/charts/grafana/dashboards/custom-dashboard.json
diff --git a/charts/admin-stack/charts/grafana/templates/_helpers.tpl b/deploy/charts/admin-stack/charts/grafana/templates/_helpers.tpl
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/_helpers.tpl
rename to deploy/charts/admin-stack/charts/grafana/templates/_helpers.tpl
diff --git a/charts/admin-stack/charts/grafana/templates/_pod.tpl b/deploy/charts/admin-stack/charts/grafana/templates/_pod.tpl
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/_pod.tpl
rename to deploy/charts/admin-stack/charts/grafana/templates/_pod.tpl
diff --git a/charts/admin-stack/charts/grafana/templates/clusterrole.yaml b/deploy/charts/admin-stack/charts/grafana/templates/clusterrole.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/clusterrole.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/clusterrole.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/clusterrolebinding.yaml b/deploy/charts/admin-stack/charts/grafana/templates/clusterrolebinding.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/clusterrolebinding.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/clusterrolebinding.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/configmap-dashboard-provider.yaml b/deploy/charts/admin-stack/charts/grafana/templates/configmap-dashboard-provider.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/configmap-dashboard-provider.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/configmap-dashboard-provider.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/configmap.yaml b/deploy/charts/admin-stack/charts/grafana/templates/configmap.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/configmap.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/configmap.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/dashboards-json-configmap.yaml b/deploy/charts/admin-stack/charts/grafana/templates/dashboards-json-configmap.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/dashboards-json-configmap.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/dashboards-json-configmap.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/deployment.yaml b/deploy/charts/admin-stack/charts/grafana/templates/deployment.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/deployment.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/deployment.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/headless-service.yaml b/deploy/charts/admin-stack/charts/grafana/templates/headless-service.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/headless-service.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/headless-service.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/ingress.yaml b/deploy/charts/admin-stack/charts/grafana/templates/ingress.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/ingress.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/ingress.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/networkpolicy.yaml b/deploy/charts/admin-stack/charts/grafana/templates/networkpolicy.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/networkpolicy.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/networkpolicy.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/poddisruptionbudget.yaml b/deploy/charts/admin-stack/charts/grafana/templates/poddisruptionbudget.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/poddisruptionbudget.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/poddisruptionbudget.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/pvc.yaml b/deploy/charts/admin-stack/charts/grafana/templates/pvc.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/pvc.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/pvc.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/role.yaml b/deploy/charts/admin-stack/charts/grafana/templates/role.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/role.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/role.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/rolebinding.yaml b/deploy/charts/admin-stack/charts/grafana/templates/rolebinding.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/rolebinding.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/rolebinding.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/secret-env.yaml b/deploy/charts/admin-stack/charts/grafana/templates/secret-env.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/secret-env.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/secret-env.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/secret.yaml b/deploy/charts/admin-stack/charts/grafana/templates/secret.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/secret.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/secret.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/service.yaml b/deploy/charts/admin-stack/charts/grafana/templates/service.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/service.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/service.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/serviceaccount.yaml b/deploy/charts/admin-stack/charts/grafana/templates/serviceaccount.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/serviceaccount.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/serviceaccount.yaml
diff --git a/charts/admin-stack/charts/grafana/templates/statefulset.yaml b/deploy/charts/admin-stack/charts/grafana/templates/statefulset.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/templates/statefulset.yaml
rename to deploy/charts/admin-stack/charts/grafana/templates/statefulset.yaml
diff --git a/charts/admin-stack/charts/grafana/values.yaml b/deploy/charts/admin-stack/charts/grafana/values.yaml
similarity index 100%
rename from charts/admin-stack/charts/grafana/values.yaml
rename to deploy/charts/admin-stack/charts/grafana/values.yaml
diff --git a/charts/admin-stack/charts/nacos/.helmignore b/deploy/charts/admin-stack/charts/nacos/.helmignore
similarity index 100%
rename from charts/admin-stack/charts/nacos/.helmignore
rename to deploy/charts/admin-stack/charts/nacos/.helmignore
diff --git a/charts/admin-stack/charts/nacos/Chart.yaml b/deploy/charts/admin-stack/charts/nacos/Chart.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/Chart.yaml
rename to deploy/charts/admin-stack/charts/nacos/Chart.yaml
diff --git a/charts/admin-stack/charts/nacos/templates/NOTES.txt b/deploy/charts/admin-stack/charts/nacos/templates/NOTES.txt
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/NOTES.txt
rename to deploy/charts/admin-stack/charts/nacos/templates/NOTES.txt
diff --git a/charts/admin-stack/charts/nacos/templates/_helpers.tpl b/deploy/charts/admin-stack/charts/nacos/templates/_helpers.tpl
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/_helpers.tpl
rename to deploy/charts/admin-stack/charts/nacos/templates/_helpers.tpl
diff --git a/charts/admin-stack/charts/nacos/templates/configmap.yaml b/deploy/charts/admin-stack/charts/nacos/templates/configmap.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/configmap.yaml
rename to deploy/charts/admin-stack/charts/nacos/templates/configmap.yaml
diff --git a/charts/admin-stack/charts/nacos/templates/networkpolicy.yaml b/deploy/charts/admin-stack/charts/nacos/templates/networkpolicy.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/networkpolicy.yaml
rename to deploy/charts/admin-stack/charts/nacos/templates/networkpolicy.yaml
diff --git a/charts/admin-stack/charts/nacos/templates/pdb.yaml b/deploy/charts/admin-stack/charts/nacos/templates/pdb.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/pdb.yaml
rename to deploy/charts/admin-stack/charts/nacos/templates/pdb.yaml
diff --git a/charts/admin-stack/charts/nacos/templates/statefulset.yaml b/deploy/charts/admin-stack/charts/nacos/templates/statefulset.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/statefulset.yaml
rename to deploy/charts/admin-stack/charts/nacos/templates/statefulset.yaml
diff --git a/charts/admin-stack/charts/nacos/templates/svc-headless.yaml b/deploy/charts/admin-stack/charts/nacos/templates/svc-headless.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/svc-headless.yaml
rename to deploy/charts/admin-stack/charts/nacos/templates/svc-headless.yaml
diff --git a/charts/admin-stack/charts/nacos/templates/svc.yaml b/deploy/charts/admin-stack/charts/nacos/templates/svc.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/templates/svc.yaml
rename to deploy/charts/admin-stack/charts/nacos/templates/svc.yaml
diff --git a/charts/admin-stack/charts/nacos/values.yaml b/deploy/charts/admin-stack/charts/nacos/values.yaml
similarity index 100%
rename from charts/admin-stack/charts/nacos/values.yaml
rename to deploy/charts/admin-stack/charts/nacos/values.yaml
diff --git a/charts/admin-stack/charts/zookeeper/.helmignore b/deploy/charts/admin-stack/charts/zookeeper/.helmignore
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/.helmignore
rename to deploy/charts/admin-stack/charts/zookeeper/.helmignore
diff --git a/charts/admin-stack/charts/zookeeper/Chart.yaml b/deploy/charts/admin-stack/charts/zookeeper/Chart.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/Chart.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/Chart.yaml
diff --git a/charts/admin-stack/charts/zookeeper/templates/NOTES.txt b/deploy/charts/admin-stack/charts/zookeeper/templates/NOTES.txt
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/NOTES.txt
rename to deploy/charts/admin-stack/charts/zookeeper/templates/NOTES.txt
diff --git a/charts/admin-stack/charts/zookeeper/templates/_helpers.tpl b/deploy/charts/admin-stack/charts/zookeeper/templates/_helpers.tpl
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/_helpers.tpl
rename to deploy/charts/admin-stack/charts/zookeeper/templates/_helpers.tpl
diff --git a/charts/admin-stack/charts/zookeeper/templates/configmap.yaml b/deploy/charts/admin-stack/charts/zookeeper/templates/configmap.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/configmap.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/templates/configmap.yaml
diff --git a/charts/admin-stack/charts/zookeeper/templates/networkpolicy.yaml b/deploy/charts/admin-stack/charts/zookeeper/templates/networkpolicy.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/networkpolicy.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/templates/networkpolicy.yaml
diff --git a/charts/admin-stack/charts/zookeeper/templates/pdb.yaml b/deploy/charts/admin-stack/charts/zookeeper/templates/pdb.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/pdb.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/templates/pdb.yaml
diff --git a/charts/admin-stack/charts/zookeeper/templates/statefulset.yaml b/deploy/charts/admin-stack/charts/zookeeper/templates/statefulset.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/statefulset.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/templates/statefulset.yaml
diff --git a/charts/admin-stack/charts/zookeeper/templates/svc-headless.yaml b/deploy/charts/admin-stack/charts/zookeeper/templates/svc-headless.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/svc-headless.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/templates/svc-headless.yaml
diff --git a/charts/admin-stack/charts/zookeeper/templates/svc.yaml b/deploy/charts/admin-stack/charts/zookeeper/templates/svc.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/templates/svc.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/templates/svc.yaml
diff --git a/charts/admin-stack/charts/zookeeper/values.yaml b/deploy/charts/admin-stack/charts/zookeeper/values.yaml
similarity index 100%
rename from charts/admin-stack/charts/zookeeper/values.yaml
rename to deploy/charts/admin-stack/charts/zookeeper/values.yaml
diff --git a/charts/admin-stack/templates/tpl/_helpers.tpl b/deploy/charts/admin-stack/templates/tpl/_helpers.tpl
similarity index 100%
rename from charts/admin-stack/templates/tpl/_helpers.tpl
rename to deploy/charts/admin-stack/templates/tpl/_helpers.tpl
diff --git a/charts/admin-stack/templates/tpl/_ingress.tpl b/deploy/charts/admin-stack/templates/tpl/_ingress.tpl
similarity index 100%
rename from charts/admin-stack/templates/tpl/_ingress.tpl
rename to deploy/charts/admin-stack/templates/tpl/_ingress.tpl
diff --git a/charts/admin-stack/templates/tpl/_kubeversions.tpl b/deploy/charts/admin-stack/templates/tpl/_kubeversions.tpl
similarity index 100%
rename from charts/admin-stack/templates/tpl/_kubeversions.tpl
rename to deploy/charts/admin-stack/templates/tpl/_kubeversions.tpl
diff --git a/charts/admin-stack/templates/tpl/_storages.tpl b/deploy/charts/admin-stack/templates/tpl/_storages.tpl
similarity index 100%
rename from charts/admin-stack/templates/tpl/_storages.tpl
rename to deploy/charts/admin-stack/templates/tpl/_storages.tpl
diff --git a/charts/admin-stack/templates/tpl/_tplvalues.tpl b/deploy/charts/admin-stack/templates/tpl/_tplvalues.tpl
similarity index 100%
rename from charts/admin-stack/templates/tpl/_tplvalues.tpl
rename to deploy/charts/admin-stack/templates/tpl/_tplvalues.tpl
diff --git a/charts/admin-stack/templates/tpl/_versions.tpl b/deploy/charts/admin-stack/templates/tpl/_versions.tpl
similarity index 100%
rename from charts/admin-stack/templates/tpl/_versions.tpl
rename to deploy/charts/admin-stack/templates/tpl/_versions.tpl
diff --git a/charts/admin-stack/values.yaml b/deploy/charts/admin-stack/values.yaml
similarity index 100%
rename from charts/admin-stack/values.yaml
rename to deploy/charts/admin-stack/values.yaml
diff --git a/ca/deploy/crd.yaml b/deploy/crd.yaml
similarity index 100%
rename from ca/deploy/crd.yaml
rename to deploy/crd.yaml
diff --git a/ca/deploy/deployment.yml b/deploy/deployment.yml
similarity index 100%
rename from ca/deploy/deployment.yml
rename to deploy/deployment.yml
diff --git a/ca/Dockerfile b/deploy/docker/authority/Dockerfile
similarity index 88%
rename from ca/Dockerfile
rename to deploy/docker/authority/Dockerfile
index 732aaea..184c02e 100644
--- a/ca/Dockerfile
+++ b/deploy/docker/authority/Dockerfile
@@ -19,7 +19,7 @@ RUN apk --update add gcc libc-dev upx ca-certificates && update-ca-certificates
ADD . /workspace
-WORKDIR /workspace
+WORKDIR /workspace/cmd/authority
#RUN --mount=type=cache,target=/go \
# go build -buildmode=pie -ldflags "-linkmode external -extldflags -static -w" \
@@ -27,13 +27,13 @@ WORKDIR /workspace
RUN --mount=type=cache,target=/go \
go build \
- -o /workspace/ca
+ -o /workspace/cmd/authority/authority
FROM alpine:3.17
EXPOSE 30060
EXPOSE 30062
-COPY --from=builder /workspace/ca /ca
+COPY --from=builder /workspace/cmd/authority/authority /authority
-CMD ["/ca"]
+CMD ["/authority"]
diff --git a/ca/deploy/example-peerauthentication.yaml b/deploy/example-peerauthentication.yaml
similarity index 100%
rename from ca/deploy/example-peerauthentication.yaml
rename to deploy/example-peerauthentication.yaml
diff --git a/kubernetes/dubbo-admin/configmap.yaml b/deploy/kubernetes/dubbo-admin/configmap.yaml
similarity index 100%
rename from kubernetes/dubbo-admin/configmap.yaml
rename to deploy/kubernetes/dubbo-admin/configmap.yaml
diff --git a/kubernetes/dubbo-admin/deployment.yaml b/deploy/kubernetes/dubbo-admin/deployment.yaml
similarity index 100%
rename from kubernetes/dubbo-admin/deployment.yaml
rename to deploy/kubernetes/dubbo-admin/deployment.yaml
diff --git a/kubernetes/dubbo-admin/pv.yaml b/deploy/kubernetes/dubbo-admin/pv.yaml
similarity index 100%
rename from kubernetes/dubbo-admin/pv.yaml
rename to deploy/kubernetes/dubbo-admin/pv.yaml
diff --git a/kubernetes/dubbo-admin/pvc.yaml b/deploy/kubernetes/dubbo-admin/pvc.yaml
similarity index 100%
rename from kubernetes/dubbo-admin/pvc.yaml
rename to deploy/kubernetes/dubbo-admin/pvc.yaml
diff --git a/kubernetes/dubbo-admin/rbac.yaml b/deploy/kubernetes/dubbo-admin/rbac.yaml
similarity index 100%
rename from kubernetes/dubbo-admin/rbac.yaml
rename to deploy/kubernetes/dubbo-admin/rbac.yaml
diff --git a/kubernetes/dubbo-admin/service.yaml b/deploy/kubernetes/dubbo-admin/service.yaml
similarity index 100%
rename from kubernetes/dubbo-admin/service.yaml
rename to deploy/kubernetes/dubbo-admin/service.yaml
diff --git a/kubernetes/dubbo-admin/storageclass.yaml b/deploy/kubernetes/dubbo-admin/storageclass.yaml
similarity index 100%
rename from kubernetes/dubbo-admin/storageclass.yaml
rename to deploy/kubernetes/dubbo-admin/storageclass.yaml
diff --git a/kubernetes/grafana/configmap.yaml b/deploy/kubernetes/grafana/configmap.yaml
similarity index 100%
rename from kubernetes/grafana/configmap.yaml
rename to deploy/kubernetes/grafana/configmap.yaml
diff --git a/kubernetes/grafana/rbac.yaml b/deploy/kubernetes/grafana/rbac.yaml
similarity index 100%
rename from kubernetes/grafana/rbac.yaml
rename to deploy/kubernetes/grafana/rbac.yaml
diff --git a/kubernetes/grafana/secret.yaml b/deploy/kubernetes/grafana/secret.yaml
similarity index 100%
rename from kubernetes/grafana/secret.yaml
rename to deploy/kubernetes/grafana/secret.yaml
diff --git a/kubernetes/grafana/service.yaml b/deploy/kubernetes/grafana/service.yaml
similarity index 100%
rename from kubernetes/grafana/service.yaml
rename to deploy/kubernetes/grafana/service.yaml
diff --git a/kubernetes/grafana/statefulset.yaml b/deploy/kubernetes/grafana/statefulset.yaml
similarity index 100%
rename from kubernetes/grafana/statefulset.yaml
rename to deploy/kubernetes/grafana/statefulset.yaml
diff --git a/kubernetes/grafana/storage.yaml b/deploy/kubernetes/grafana/storage.yaml
similarity index 100%
rename from kubernetes/grafana/storage.yaml
rename to deploy/kubernetes/grafana/storage.yaml
diff --git a/kubernetes/nacos/pv.yaml b/deploy/kubernetes/nacos/pv.yaml
similarity index 100%
rename from kubernetes/nacos/pv.yaml
rename to deploy/kubernetes/nacos/pv.yaml
diff --git a/kubernetes/nacos/pvc.yaml b/deploy/kubernetes/nacos/pvc.yaml
similarity index 100%
rename from kubernetes/nacos/pvc.yaml
rename to deploy/kubernetes/nacos/pvc.yaml
diff --git a/kubernetes/nacos/service.yaml b/deploy/kubernetes/nacos/service.yaml
similarity index 100%
rename from kubernetes/nacos/service.yaml
rename to deploy/kubernetes/nacos/service.yaml
diff --git a/kubernetes/nacos/statefulset.yaml b/deploy/kubernetes/nacos/statefulset.yaml
similarity index 100%
rename from kubernetes/nacos/statefulset.yaml
rename to deploy/kubernetes/nacos/statefulset.yaml
diff --git a/kubernetes/nacos/storageclass.yaml b/deploy/kubernetes/nacos/storageclass.yaml
similarity index 100%
rename from kubernetes/nacos/storageclass.yaml
rename to deploy/kubernetes/nacos/storageclass.yaml
diff --git a/kubernetes/prometheus/configmap.yaml b/deploy/kubernetes/prometheus/configmap.yaml
similarity index 100%
rename from kubernetes/prometheus/configmap.yaml
rename to deploy/kubernetes/prometheus/configmap.yaml
diff --git a/kubernetes/prometheus/pv.yaml b/deploy/kubernetes/prometheus/pv.yaml
similarity index 100%
rename from kubernetes/prometheus/pv.yaml
rename to deploy/kubernetes/prometheus/pv.yaml
diff --git a/kubernetes/prometheus/pvc.yaml b/deploy/kubernetes/prometheus/pvc.yaml
similarity index 100%
rename from kubernetes/prometheus/pvc.yaml
rename to deploy/kubernetes/prometheus/pvc.yaml
diff --git a/kubernetes/prometheus/rbac.yaml b/deploy/kubernetes/prometheus/rbac.yaml
similarity index 100%
rename from kubernetes/prometheus/rbac.yaml
rename to deploy/kubernetes/prometheus/rbac.yaml
diff --git a/kubernetes/prometheus/service.yaml b/deploy/kubernetes/prometheus/service.yaml
similarity index 100%
rename from kubernetes/prometheus/service.yaml
rename to deploy/kubernetes/prometheus/service.yaml
diff --git a/kubernetes/prometheus/statefulset.yaml b/deploy/kubernetes/prometheus/statefulset.yaml
similarity index 100%
rename from kubernetes/prometheus/statefulset.yaml
rename to deploy/kubernetes/prometheus/statefulset.yaml
diff --git a/kubernetes/prometheus/storageclass.yaml b/deploy/kubernetes/prometheus/storageclass.yaml
similarity index 100%
rename from kubernetes/prometheus/storageclass.yaml
rename to deploy/kubernetes/prometheus/storageclass.yaml
diff --git a/kubernetes/zookeeper/configmap.yaml b/deploy/kubernetes/zookeeper/configmap.yaml
similarity index 100%
rename from kubernetes/zookeeper/configmap.yaml
rename to deploy/kubernetes/zookeeper/configmap.yaml
diff --git a/kubernetes/zookeeper/pv.yaml b/deploy/kubernetes/zookeeper/pv.yaml
similarity index 100%
rename from kubernetes/zookeeper/pv.yaml
rename to deploy/kubernetes/zookeeper/pv.yaml
diff --git a/kubernetes/zookeeper/pvc.yaml b/deploy/kubernetes/zookeeper/pvc.yaml
similarity index 100%
rename from kubernetes/zookeeper/pvc.yaml
rename to deploy/kubernetes/zookeeper/pvc.yaml
diff --git a/kubernetes/zookeeper/service.yaml b/deploy/kubernetes/zookeeper/service.yaml
similarity index 100%
rename from kubernetes/zookeeper/service.yaml
rename to deploy/kubernetes/zookeeper/service.yaml
diff --git a/kubernetes/zookeeper/statefulset.yaml b/deploy/kubernetes/zookeeper/statefulset.yaml
similarity index 100%
rename from kubernetes/zookeeper/statefulset.yaml
rename to deploy/kubernetes/zookeeper/statefulset.yaml
diff --git a/kubernetes/zookeeper/storageclass.yaml b/deploy/kubernetes/zookeeper/storageclass.yaml
similarity index 100%
rename from kubernetes/zookeeper/storageclass.yaml
rename to deploy/kubernetes/zookeeper/storageclass.yaml
diff --git a/ca/deploy/permission.yml b/deploy/permission.yml
similarity index 100%
rename from ca/deploy/permission.yml
rename to deploy/permission.yml
diff --git a/docker/0.1.0/Dockerfile b/docker/0.1.0/Dockerfile
deleted file mode 100644
index fef03d7..0000000
--- a/docker/0.1.0/Dockerfile
+++ /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.
-
-FROM openjdk:8-jdk
-RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.1.zip && unzip 0.1.zip -d /source
-WORKDIR /source/dubbo-admin-0.1
-RUN ./mvnw clean package -Dmaven.test.skip=true
-
-FROM openjdk:8-jre
-LABEL maintainer="dev@dubbo.apache.org"
-COPY --from=0 /source/dubbo-admin-0.1/dubbo-admin-distribution/target/dubbo-admin-0.1.jar /app.jar
-ENTRYPOINT ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
-EXPOSE 8080
diff --git a/docker/0.2.0/Dockerfile b/docker/0.2.0/Dockerfile
deleted file mode 100644
index 180865b..0000000
--- a/docker/0.2.0/Dockerfile
+++ /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.
-
-FROM maven:3-openjdk-8
-RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.2.0.zip && unzip -q 0.2.0.zip -d /source
-WORKDIR /source/dubbo-admin-0.2.0
-RUN mvn --batch-mode clean package -Dmaven.test.skip=true
-
-FROM openjdk:8-jre
-LABEL maintainer="dev@dubbo.apache.org"
-COPY --from=0 /source/dubbo-admin-0.2.0/dubbo-admin-distribution/target/dubbo-admin-0.2.0.jar /app.jar
-ENTRYPOINT ["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
-EXPOSE 8080
diff --git a/docker/0.3.0/Dockerfile b/docker/0.3.0/Dockerfile
deleted file mode 100644
index ac31116..0000000
--- a/docker/0.3.0/Dockerfile
+++ /dev/null
@@ -1,30 +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.
-
-FROM maven:3-openjdk-8
-RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.3.0.zip && unzip -q 0.3.0.zip -d /source
-WORKDIR /source/dubbo-admin-0.3.0
-RUN mvn --batch-mode clean package -Dmaven.test.skip=true
-
-FROM openjdk:8-jre
-LABEL maintainer="dev@dubbo.apache.org"
-RUN apt-get update && apt-get install -y tini
-COPY --from=0 /source/dubbo-admin-0.3.0/dubbo-admin-distribution/target/dubbo-admin-0.3.0.jar /app.jar
-COPY --from=0 /source/dubbo-admin-0.3.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
-
-ENV JAVA_OPTS ""
-
-ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
-EXPOSE 8080
diff --git a/docker/0.3.0/Dockerfile.test b/docker/0.3.0/Dockerfile.test
deleted file mode 100644
index dee4d1d..0000000
--- a/docker/0.3.0/Dockerfile.test
+++ /dev/null
@@ -1,23 +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.
-
-FROM ubuntu:trusty
-RUN apt-get update && apt-get install -yq curl && apt-get clean
-
-WORKDIR /app
-
-ADD test.sh /app/test.sh
-
-CMD ["bash", "test.sh"]
\ No newline at end of file
diff --git a/docker/0.3.0/docker-compose.test.yml b/docker/0.3.0/docker-compose.test.yml
deleted file mode 100644
index 9ac7fec..0000000
--- a/docker/0.3.0/docker-compose.test.yml
+++ /dev/null
@@ -1,33 +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.
-
-zookeeper:
- image: zookeeper:3.5
-admin:
- build: .
- dockerfile: Dockerfile
- links:
- - zookeeper
- environment:
- - admin.registry.address=zookeeper://zookeeper:2181
- - admin.config-center=zookeeper://zookeeper:2181
- - admin.metadata-report.address=zookeeper://zookeeper:2181
- ports:
- - 8080
-sut:
- build: .
- dockerfile: Dockerfile.test
- links:
- - admin
\ No newline at end of file
diff --git a/docker/0.3.0/test.sh b/docker/0.3.0/test.sh
deleted file mode 100755
index d342e35..0000000
--- a/docker/0.3.0/test.sh
+++ /dev/null
@@ -1,34 +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.
-
-LOOP_SIZE=60
-i=0
-
-while [[ $i -lt LOOP_SIZE ]]; do
- status_code=$(curl --write-out %{http_code} --silent --output /dev/null http://admin:8080)
-
- if [[ "$status_code" -eq 200 ]] ; then
- echo "Tests passed!"
- exit 0
- else
- curl -v http://admin:8080
- echo "status is incorrect, waiting for next turn"
- fi
- sleep 5
- i=$i+1
-done
-
-echo "Tests failed!"
-exit 1
\ No newline at end of file
diff --git a/docker/0.4.0/Dockerfile b/docker/0.4.0/Dockerfile
deleted file mode 100644
index 621959c..0000000
--- a/docker/0.4.0/Dockerfile
+++ /dev/null
@@ -1,30 +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.
-
-FROM maven:3-openjdk-8
-RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.4.0.zip && unzip -q 0.4.0.zip -d /source
-WORKDIR /source/dubbo-admin-0.4.0
-RUN mvn --batch-mode clean package -Dmaven.test.skip=true
-
-FROM openjdk:8-jre
-LABEL maintainer="dev@dubbo.apache.org"
-RUN apt-get update && apt-get install -y tini
-COPY --from=0 /source/dubbo-admin-0.4.0/dubbo-admin-distribution/target/dubbo-admin-0.4.0.jar /app.jar
-COPY --from=0 /source/dubbo-admin-0.4.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
-
-ENV JAVA_OPTS ""
-
-ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
-EXPOSE 8080
diff --git a/docker/0.4.0/Dockerfile.test b/docker/0.4.0/Dockerfile.test
deleted file mode 100644
index dee4d1d..0000000
--- a/docker/0.4.0/Dockerfile.test
+++ /dev/null
@@ -1,23 +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.
-
-FROM ubuntu:trusty
-RUN apt-get update && apt-get install -yq curl && apt-get clean
-
-WORKDIR /app
-
-ADD test.sh /app/test.sh
-
-CMD ["bash", "test.sh"]
\ No newline at end of file
diff --git a/docker/0.4.0/docker-compose.test.yml b/docker/0.4.0/docker-compose.test.yml
deleted file mode 100644
index 9ac7fec..0000000
--- a/docker/0.4.0/docker-compose.test.yml
+++ /dev/null
@@ -1,33 +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.
-
-zookeeper:
- image: zookeeper:3.5
-admin:
- build: .
- dockerfile: Dockerfile
- links:
- - zookeeper
- environment:
- - admin.registry.address=zookeeper://zookeeper:2181
- - admin.config-center=zookeeper://zookeeper:2181
- - admin.metadata-report.address=zookeeper://zookeeper:2181
- ports:
- - 8080
-sut:
- build: .
- dockerfile: Dockerfile.test
- links:
- - admin
\ No newline at end of file
diff --git a/docker/0.4.0/test.sh b/docker/0.4.0/test.sh
deleted file mode 100644
index d342e35..0000000
--- a/docker/0.4.0/test.sh
+++ /dev/null
@@ -1,34 +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.
-
-LOOP_SIZE=60
-i=0
-
-while [[ $i -lt LOOP_SIZE ]]; do
- status_code=$(curl --write-out %{http_code} --silent --output /dev/null http://admin:8080)
-
- if [[ "$status_code" -eq 200 ]] ; then
- echo "Tests passed!"
- exit 0
- else
- curl -v http://admin:8080
- echo "status is incorrect, waiting for next turn"
- fi
- sleep 5
- i=$i+1
-done
-
-echo "Tests failed!"
-exit 1
\ No newline at end of file
diff --git a/docker/0.5.0/Dockerfile b/docker/0.5.0/Dockerfile
deleted file mode 100644
index 0cf7bcd..0000000
--- a/docker/0.5.0/Dockerfile
+++ /dev/null
@@ -1,30 +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.
-
-FROM maven:3-openjdk-8
-RUN mkdir /source && wget https://github.com/apache/dubbo-admin/archive/0.5.0.zip && unzip -q 0.5.0.zip -d /source
-WORKDIR /source/dubbo-admin-0.5.0
-RUN mvn --batch-mode clean package -Dmaven.test.skip=true
-
-FROM openjdk:8-jre
-LABEL maintainer="dev@dubbo.apache.org"
-RUN apt-get update && apt-get install -y tini
-COPY --from=0 /source/dubbo-admin-0.5.0/dubbo-admin-distribution/target/dubbo-admin-0.5.0.jar /app.jar
-COPY --from=0 /source/dubbo-admin-0.5.0/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
-
-ENV JAVA_OPTS ""
-
-ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
-EXPOSE 8080
diff --git a/docker/0.5.0/Dockerfile.test b/docker/0.5.0/Dockerfile.test
deleted file mode 100644
index dee4d1d..0000000
--- a/docker/0.5.0/Dockerfile.test
+++ /dev/null
@@ -1,23 +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.
-
-FROM ubuntu:trusty
-RUN apt-get update && apt-get install -yq curl && apt-get clean
-
-WORKDIR /app
-
-ADD test.sh /app/test.sh
-
-CMD ["bash", "test.sh"]
\ No newline at end of file
diff --git a/docker/0.5.0/docker-compose.test.yml b/docker/0.5.0/docker-compose.test.yml
deleted file mode 100644
index 9ac7fec..0000000
--- a/docker/0.5.0/docker-compose.test.yml
+++ /dev/null
@@ -1,33 +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.
-
-zookeeper:
- image: zookeeper:3.5
-admin:
- build: .
- dockerfile: Dockerfile
- links:
- - zookeeper
- environment:
- - admin.registry.address=zookeeper://zookeeper:2181
- - admin.config-center=zookeeper://zookeeper:2181
- - admin.metadata-report.address=zookeeper://zookeeper:2181
- ports:
- - 8080
-sut:
- build: .
- dockerfile: Dockerfile.test
- links:
- - admin
\ No newline at end of file
diff --git a/docker/0.5.0/test.sh b/docker/0.5.0/test.sh
deleted file mode 100644
index d342e35..0000000
--- a/docker/0.5.0/test.sh
+++ /dev/null
@@ -1,34 +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.
-
-LOOP_SIZE=60
-i=0
-
-while [[ $i -lt LOOP_SIZE ]]; do
- status_code=$(curl --write-out %{http_code} --silent --output /dev/null http://admin:8080)
-
- if [[ "$status_code" -eq 200 ]] ; then
- echo "Tests passed!"
- exit 0
- else
- curl -v http://admin:8080
- echo "status is incorrect, waiting for next turn"
- fi
- sleep 5
- i=$i+1
-done
-
-echo "Tests failed!"
-exit 1
\ No newline at end of file
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100755
index 8c80090..0000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -e
-exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar
diff --git a/docker/latest/Dockerfile b/docker/latest/Dockerfile
deleted file mode 100644
index d9f8696..0000000
--- a/docker/latest/Dockerfile
+++ /dev/null
@@ -1,31 +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.
-
-FROM maven:3-openjdk-8
-RUN mkdir -p /source/dubbo-admin-snapshot
-ADD . /source/dubbo-admin-snapshot
-WORKDIR /source/dubbo-admin-snapshot
-RUN mvn --batch-mode -Prelease clean package -Dmaven.test.skip=true
-
-FROM openjdk:8-jre
-LABEL maintainer="dev@dubbo.apache.org"
-RUN apt-get update && apt-get install -y tini
-COPY --from=0 /source/dubbo-admin-snapshot/dubbo-admin-distribution/target/dubbo-admin-0.5.0-SNAPSHOT.jar /app.jar
-COPY --from=0 /source/dubbo-admin-snapshot/docker/entrypoint.sh /usr/local/bin/entrypoint.sh
-
-ENV JAVA_OPTS "-Dloader.path=/opt-libs"
-
-ENTRYPOINT ["tini", "--", "/usr/local/bin/entrypoint.sh"]
-EXPOSE 8080
diff --git a/docker/stack.yml b/docker/stack.yml
deleted file mode 100644
index 7168206..0000000
--- a/docker/stack.yml
+++ /dev/null
@@ -1,45 +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.
-
-version: '3'
-
-services:
- zookeeper:
- image: zookeeper
- ports:
- - 2181:2181
- admin:
- image: apache/dubbo-admin:0.3.0
- depends_on:
- - zookeeper
- ports:
- - 38080:38080
-# the db driver path
- volumes:
- - "/mnt/opt-libs:/opt-libs"
- environment:
- - admin.registry.address=zookeeper://zookeeper:2181
- - admin.config-center=zookeeper://zookeeper:2181
- - admin.metadata-report.address=zookeeper://zookeeper:2181
- - dubbo.application.name=dubbo-admin
- - dubbo.registry.address=zookeeper://zookeeper:2181
- - mybatis-plus.global-config.db-config.id-type=none
- - spring.datasource.driver-class-name=com.mysql.jdbc.Driver
- - spring.datasource.url=jdbc:mysql://xxx:3306/dubbo-admin?characterEncoding=utf8&connectTimeout=1000&socketTimeout=10000&autoReconnect=true
- - spring.datasource.username=root
- - spring.datasource.password=mysql
-# use internal h2 as database
-# - spring.datasource.url=jdbc:h2:mem:~/dubbo-admin;
-# - spring.datasource.username=sa
\ No newline at end of file
diff --git a/doc/images/ide_configuration.png b/docs/images/ide_configuration.png
similarity index 100%
rename from doc/images/ide_configuration.png
rename to docs/images/ide_configuration.png
diff --git a/doc/images/index.png b/docs/images/index.png
similarity index 100%
rename from doc/images/index.png
rename to docs/images/index.png
diff --git a/doc/images/logo.png b/docs/images/logo.png
similarity index 100%
rename from doc/images/logo.png
rename to docs/images/logo.png
diff --git a/doc/images/profile-eclipse.jpg b/docs/images/profile-eclipse.jpg
similarity index 100%
rename from doc/images/profile-eclipse.jpg
rename to docs/images/profile-eclipse.jpg
diff --git a/doc/images/profile-idea.jpg b/docs/images/profile-idea.jpg
similarity index 100%
rename from doc/images/profile-idea.jpg
rename to docs/images/profile-idea.jpg
diff --git a/dubbo-admin-server/pkg/model/entity.go b/dubbo-admin-server/pkg/model/entity.go
deleted file mode 100644
index 40fc3cd..0000000
--- a/dubbo-admin-server/pkg/model/entity.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package model
-
-type Entity struct {
- ID string
- Hash string
-}
diff --git a/dubbo-admin-server/pkg/model/provider.go b/dubbo-admin-server/pkg/model/provider.go
deleted file mode 100644
index e0c4a29..0000000
--- a/dubbo-admin-server/pkg/model/provider.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package model
-
-import "time"
-
-type Provider struct {
- Entity
- Service string
- URL string
- Parameters string
- Address string
- Registry string
- Dynamic bool
- Enabled bool
- Timeout int64
- Serialization string
- Weight int64
- Application string
- Username string
- Expired time.Duration
- Alived int64
- RegistrySource RegistrySource
-}
diff --git a/dubbo-admin-server/pkg/model/registry_source.go b/dubbo-admin-server/pkg/model/registry_source.go
deleted file mode 100644
index 32057de..0000000
--- a/dubbo-admin-server/pkg/model/registry_source.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package model
-
-type RegistrySource int
-
-const (
- All RegistrySource = iota
-
- Interface
-
- Instance
-)
diff --git a/dubbo-admin-server/pkg/services/provider_service.go b/dubbo-admin-server/pkg/services/provider_service.go
deleted file mode 100644
index 0eef9fe..0000000
--- a/dubbo-admin-server/pkg/services/provider_service.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package services
-
-import "admin/pkg/model"
-
-type ProviderService interface {
- FindServices() []string
- FindService(string, string) []*model.Provider
-}
diff --git a/dubbo-admin-server/pkg/util/sync_utils.go b/dubbo-admin-server/pkg/util/sync_utils.go
deleted file mode 100644
index 1883b07..0000000
--- a/dubbo-admin-server/pkg/util/sync_utils.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package util
-
-import (
- "admin/pkg/constant"
- "admin/pkg/model"
- "dubbo.apache.org/dubbo-go/v3/common"
-)
-
-func URL2Provider(id string, url *common.URL) *model.Provider {
- if url == nil {
- return nil
- }
-
- return &model.Provider{
- Entity: model.Entity{Hash: id},
- Service: url.ServiceKey(),
- Address: url.Location,
- Application: url.GetParam(constant.ApplicationKey, ""),
- URL: url.Key(),
- Parameters: url.String(),
- Dynamic: url.GetParamBool(constant.DynamicKey, true),
- Enabled: url.GetParamBool(constant.EnabledKey, true),
- Serialization: url.GetParam(constant.SerializationKey, "hessian2"),
- Timeout: url.GetParamInt(constant.TimeoutKey, constant.DefaultTimeout),
- Weight: url.GetParamInt(constant.WeightKey, constant.DefaultWeight),
- Username: url.GetParam(constant.OwnerKey, ""),
- RegistrySource: model.Interface,
- }
-}
diff --git a/dubbo-admin-server/go.mod b/go.mod
similarity index 67%
rename from dubbo-admin-server/go.mod
rename to go.mod
index 867704f..e7da775 100644
--- a/dubbo-admin-server/go.mod
+++ b/go.mod
@@ -14,14 +14,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-module admin
+module github.com/apache/dubbo-admin
-go 1.18
+go 1.19
require (
dubbo.apache.org/dubbo-go/v3 v3.0.2
github.com/gin-gonic/gin v1.8.2
+ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+ github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24
+ go.uber.org/zap v1.24.0
+ golang.org/x/net v0.7.0
+ google.golang.org/grpc v1.53.0
+ google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v2 v2.4.0
+ k8s.io/api v0.26.1
+ k8s.io/apimachinery v0.26.1
+ k8s.io/client-go v0.26.1
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.3
)
require (
@@ -35,32 +45,45 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.2.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/creasty/defaults v1.5.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5 // indirect
github.com/dubbogo/gost v1.11.25 // indirect
github.com/dubbogo/triple v1.1.8 // indirect
+ github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+ github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-errors/errors v1.0.1 // indirect
github.com/go-kit/log v0.1.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
+ github.com/go-logr/logr v1.2.3 // indirect
github.com/go-ole/go-ole v1.2.4 // indirect
+ github.com/go-openapi/jsonpointer v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.20.0 // indirect
+ github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.11.1 // indirect
github.com/goccy/go-json v0.9.11 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
+ github.com/google/gnostic v0.5.7-v3refs // indirect
+ github.com/google/go-cmp v0.5.9 // indirect
+ github.com/google/gofuzz v1.1.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
+ github.com/imdario/mergo v0.3.6 // indirect
github.com/jinzhu/copier v0.3.5 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/k0kubun/pp v3.0.1+incompatible // indirect
github.com/knadh/koanf v1.4.1 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/magiconair/properties v1.8.6 // indirect
+ github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
@@ -70,6 +93,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mschoch/smat v0.2.0 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/nacos-group/nacos-sdk-go v1.1.1 // indirect
github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
github.com/pelletier/go-toml v1.7.0 // indirect
@@ -82,18 +106,28 @@ require (
github.com/prometheus/statsd_exporter v0.21.0 // indirect
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
github.com/shirou/gopsutil v3.20.11+incompatible // indirect
+ github.com/spf13/pflag v1.0.5 // indirect
+ github.com/stretchr/testify v1.8.2 // indirect
github.com/ugorji/go/codec v1.2.7 // indirect
go.opencensus.io v0.23.0 // indirect
- go.uber.org/atomic v1.9.0 // indirect
- go.uber.org/multierr v1.6.0 // indirect
- go.uber.org/zap v1.21.0 // indirect
- golang.org/x/crypto v0.1.0 // indirect
- golang.org/x/net v0.7.0 // indirect
+ go.uber.org/atomic v1.10.0 // indirect
+ go.uber.org/multierr v1.9.0 // indirect
+ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
+ golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.5.0 // indirect
+ golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
- google.golang.org/grpc v1.47.0 // indirect
- google.golang.org/protobuf v1.28.1 // indirect
+ golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 // indirect
+ gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.51.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+ k8s.io/klog/v2 v2.80.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
+ k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
+ sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+ sigs.k8s.io/yaml v1.3.0 // indirect
)
diff --git a/dubbo-admin-server/go.sum b/go.sum
similarity index 93%
rename from dubbo-admin-server/go.sum
rename to go.sum
index 6d929f8..0f70082 100644
--- a/dubbo-admin-server/go.sum
+++ b/go.sum
@@ -110,8 +110,9 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -154,6 +155,7 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
github.com/dubbogo/go-zookeeper v1.0.3/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c=
github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5 h1:XoR8SSVziXe698dt4uZYDfsmHpKLemqAgFyndQsq5Kw=
github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c=
@@ -175,6 +177,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
github.com/emicklei/go-restful/v3 v3.7.4/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
+github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -186,6 +190,8 @@ github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.
github.com/envoyproxy/go-control-plane v0.10.0/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84=
+github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch/v5 v5.5.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc=
@@ -224,11 +230,21 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
+github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
+github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
@@ -253,6 +269,7 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
@@ -304,6 +321,8 @@ github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b/go.mod h1:Z4GIJBJO3Wa4gD4vbwQxXXZ+WHmW6E9ixmNrwvs0iZs=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
+github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -316,9 +335,12 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
+github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -332,6 +354,7 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@@ -347,6 +370,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
+github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
@@ -409,6 +434,8 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
+github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
@@ -425,6 +452,8 @@ github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -476,6 +505,12 @@ github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0Q
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
+github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24 h1:uYuGXJBAi1umT+ZS4oQJUgKtfXCAYTR+n9zw1ViT0vA=
+github.com/mattbaird/jsonpatch v0.0.0-20200820163806-098863c1fc24/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -523,6 +558,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nacos-group/nacos-sdk-go v1.0.8/go.mod h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
@@ -544,8 +581,11 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -676,6 +716,7 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk=
github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
@@ -691,8 +732,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
@@ -752,16 +794,18 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
+go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
@@ -769,8 +813,9 @@ go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
-go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -781,9 +826,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -877,6 +921,8 @@ golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4Iltr
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.4.0 h1:NF0gk8LVPg1Ml7SSbGyySuoxdsXitj7TvgvuRxIMc/M=
+golang.org/x/oauth2 v0.4.0/go.mod h1:RznEsdpjGAINPTOF0UH/t+xJ75L18YO3Ho6Pyn+uRec=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -959,6 +1005,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -976,6 +1024,8 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -1063,6 +1113,8 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -1098,9 +1150,12 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210106152847-07624b53cd92/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
google.golang.org/genproto v0.0.0-20211104193956-4c6863e31247/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148 h1:muK+gVBJBfFb4SejshDBlN2/UgxCCOKH9Y34ljqEGOc=
+google.golang.org/genproto v0.0.0-20230221151758-ace64dc21148/go.mod h1:3Dl5ZL0q0isWJt+FVcfpQyirqemEuLAK/iFvg1UP1Hw=
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
@@ -1129,8 +1184,9 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc=
+google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -1159,6 +1215,8 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
@@ -1179,6 +1237,7 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -1191,10 +1250,28 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
+k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg=
+k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
+k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
+k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU=
+k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE=
+k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
+k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
+k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs=
+k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
+sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
diff --git a/dubbo-admin-server/pkg/cache/interface_registry_cache.go b/pkg/admin/cache/interface_registry_cache.go
similarity index 100%
rename from dubbo-admin-server/pkg/cache/interface_registry_cache.go
rename to pkg/admin/cache/interface_registry_cache.go
diff --git a/dubbo-admin-server/pkg/config/address_config.go b/pkg/admin/config/address_config.go
similarity index 100%
rename from dubbo-admin-server/pkg/config/address_config.go
rename to pkg/admin/config/address_config.go
diff --git a/dubbo-admin-server/pkg/config/config.go b/pkg/admin/config/config.go
similarity index 97%
rename from dubbo-admin-server/pkg/config/config.go
rename to pkg/admin/config/config.go
index e65892f..115270f 100644
--- a/dubbo-admin-server/pkg/config/config.go
+++ b/pkg/admin/config/config.go
@@ -18,13 +18,13 @@
package config
import (
- "admin/pkg/constant"
- _ "admin/pkg/imports"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/config_center"
"dubbo.apache.org/dubbo-go/v3/metadata/report"
"dubbo.apache.org/dubbo-go/v3/registry"
"fmt"
+ "github.com/apache/dubbo-admin/pkg/admin/constant"
+ _ "github.com/apache/dubbo-admin/pkg/admin/imports"
"gopkg.in/yaml.v2"
"log"
"net/url"
diff --git a/dubbo-admin-server/pkg/constant/const.go b/pkg/admin/constant/const.go
similarity index 100%
rename from dubbo-admin-server/pkg/constant/const.go
rename to pkg/admin/constant/const.go
diff --git a/dubbo-admin-server/pkg/handlers/service.go b/pkg/admin/handlers/service.go
similarity index 96%
rename from dubbo-admin-server/pkg/handlers/service.go
rename to pkg/admin/handlers/service.go
index 8a036aa..8057008 100644
--- a/dubbo-admin-server/pkg/handlers/service.go
+++ b/pkg/admin/handlers/service.go
@@ -18,7 +18,7 @@
package handlers
import (
- "admin/pkg/services"
+ "github.com/apache/dubbo-admin/pkg/admin/services"
"github.com/gin-gonic/gin"
"net/http"
)
diff --git a/dubbo-admin-server/pkg/imports/imports.go b/pkg/admin/imports/imports.go
similarity index 100%
rename from dubbo-admin-server/pkg/imports/imports.go
rename to pkg/admin/imports/imports.go
diff --git a/ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go b/pkg/admin/model/entity.go
similarity index 85%
copy from ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go
copy to pkg/admin/model/entity.go
index b4d6c1d..c2e8ce0 100644
--- a/ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go
+++ b/pkg/admin/model/entity.go
@@ -1,6 +1,3 @@
-// +k8s:deepcopy-gen=package
-// +groupName=dubbo.apache.org
-
// 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.
@@ -8,7 +5,7 @@
// (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
+// 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,
@@ -16,4 +13,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package v1beta1
+package model
+
+type Entity struct {
+ ID string
+ Hash string
+}
diff --git a/ca/pkg/k8s/controller_test.go b/pkg/admin/model/provider.go
similarity index 61%
copy from ca/pkg/k8s/controller_test.go
copy to pkg/admin/model/provider.go
index 096b91f..7b00f89 100644
--- a/ca/pkg/k8s/controller_test.go
+++ b/pkg/admin/model/provider.go
@@ -5,7 +5,7 @@
// (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
+// 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,
@@ -13,22 +13,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package k8s
+package model
-import (
- "testing"
-)
-
-func TestName(t *testing.T) {
- //logger.Init()
- //client := NewClient()
- //client.Init(&config.Options{})
- //client.InitController(authentication.NewHandler(), authorization.NewHandler())
- //
- //ch := make(chan struct{})
- //<-ch
-}
-
-func TestName2(t *testing.T) {
+import "time"
+type Provider struct {
+ Entity
+ Service string
+ URL string
+ Parameters string
+ Address string
+ Registry string
+ Dynamic bool
+ Enabled bool
+ Timeout int64
+ Serialization string
+ Weight int64
+ Application string
+ Username string
+ Expired time.Duration
+ Alived int64
+ RegistrySource RegistrySource
}
diff --git a/ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go b/pkg/admin/model/registry_source.go
similarity index 83%
copy from ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go
copy to pkg/admin/model/registry_source.go
index b4d6c1d..56df801 100644
--- a/ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go
+++ b/pkg/admin/model/registry_source.go
@@ -1,6 +1,3 @@
-// +k8s:deepcopy-gen=package
-// +groupName=dubbo.apache.org
-
// 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.
@@ -8,7 +5,7 @@
// (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
+// 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,
@@ -16,4 +13,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package v1beta1
+package model
+
+type RegistrySource int
+
+const (
+ All RegistrySource = iota
+
+ Interface
+
+ Instance
+)
diff --git a/dubbo-admin-server/router/router.go b/pkg/admin/router/router.go
similarity index 95%
rename from dubbo-admin-server/router/router.go
rename to pkg/admin/router/router.go
index a99c68e..5c28c09 100644
--- a/dubbo-admin-server/router/router.go
+++ b/pkg/admin/router/router.go
@@ -18,7 +18,7 @@
package router
import (
- "admin/pkg/handlers"
+ "github.com/apache/dubbo-admin/pkg/admin/handlers"
"github.com/gin-gonic/gin"
)
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/generated_expansion.go b/pkg/admin/services/provider_service.go
similarity index 76%
copy from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/generated_expansion.go
copy to pkg/admin/services/provider_service.go
index 7811d7c..c7a7fea 100644
--- a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/generated_expansion.go
+++ b/pkg/admin/services/provider_service.go
@@ -5,7 +5,7 @@
// (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
+// 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,
@@ -13,10 +13,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by client-gen. DO NOT EDIT.
+package services
-package v1beta1
+import "github.com/apache/dubbo-admin/pkg/admin/model"
-type AuthenticationPolicyExpansion interface{}
-
-type AuthorizationPolicyExpansion interface{}
+type ProviderService interface {
+ FindServices() []string
+ FindService(string, string) []*model.Provider
+}
diff --git a/dubbo-admin-server/pkg/services/provider_service_impl.go b/pkg/admin/services/provider_service_impl.go
similarity index 60%
rename from dubbo-admin-server/pkg/services/provider_service_impl.go
rename to pkg/admin/services/provider_service_impl.go
index 85ceebe..3842409 100644
--- a/dubbo-admin-server/pkg/services/provider_service_impl.go
+++ b/pkg/admin/services/provider_service_impl.go
@@ -1,12 +1,27 @@
+// 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 services
import (
- "admin/pkg/cache"
- "admin/pkg/constant"
- "admin/pkg/model"
- "admin/pkg/util"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/logger"
+ "github.com/apache/dubbo-admin/pkg/admin/cache"
+ "github.com/apache/dubbo-admin/pkg/admin/constant"
+ "github.com/apache/dubbo-admin/pkg/admin/model"
+ "github.com/apache/dubbo-admin/pkg/admin/util"
"sync"
)
diff --git a/dubbo-admin-server/pkg/services/registry_service_sync.go b/pkg/admin/services/registry_service_sync.go
similarity index 96%
rename from dubbo-admin-server/pkg/services/registry_service_sync.go
rename to pkg/admin/services/registry_service_sync.go
index c9bd1ee..3e874cf 100644
--- a/dubbo-admin-server/pkg/services/registry_service_sync.go
+++ b/pkg/admin/services/registry_service_sync.go
@@ -18,10 +18,10 @@
package services
import (
- "admin/pkg/cache"
- "admin/pkg/constant"
- util2 "admin/pkg/util"
"dubbo.apache.org/dubbo-go/v3/common/logger"
+ "github.com/apache/dubbo-admin/pkg/admin/cache"
+ "github.com/apache/dubbo-admin/pkg/admin/constant"
+ util2 "github.com/apache/dubbo-admin/pkg/admin/util"
"net/url"
"strings"
"sync"
diff --git a/dubbo-admin-server/pkg/util/Tool.go b/pkg/admin/util/Tool.go
similarity index 100%
rename from dubbo-admin-server/pkg/util/Tool.go
rename to pkg/admin/util/Tool.go
diff --git a/dubbo-admin-server/pkg/util/base_service_metadata.go b/pkg/admin/util/base_service_metadata.go
similarity index 100%
rename from dubbo-admin-server/pkg/util/base_service_metadata.go
rename to pkg/admin/util/base_service_metadata.go
diff --git a/dubbo-admin-server/pkg/util/hash.go b/pkg/admin/util/hash.go
similarity index 100%
rename from dubbo-admin-server/pkg/util/hash.go
rename to pkg/admin/util/hash.go
diff --git a/pkg/admin/util/sync_utils.go b/pkg/admin/util/sync_utils.go
new file mode 100644
index 0000000..95de8e2
--- /dev/null
+++ b/pkg/admin/util/sync_utils.go
@@ -0,0 +1,44 @@
+// 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 util
+
+import (
+ "dubbo.apache.org/dubbo-go/v3/common"
+ "github.com/apache/dubbo-admin/pkg/admin/constant"
+ "github.com/apache/dubbo-admin/pkg/admin/model"
+)
+
+func URL2Provider(id string, url *common.URL) *model.Provider {
+ if url == nil {
+ return nil
+ }
+
+ return &model.Provider{
+ Entity: model.Entity{Hash: id},
+ Service: url.ServiceKey(),
+ Address: url.Location,
+ Application: url.GetParam(constant.ApplicationKey, ""),
+ URL: url.Key(),
+ Parameters: url.String(),
+ Dynamic: url.GetParamBool(constant.DynamicKey, true),
+ Enabled: url.GetParamBool(constant.EnabledKey, true),
+ Serialization: url.GetParam(constant.SerializationKey, "hessian2"),
+ Timeout: url.GetParamInt(constant.TimeoutKey, constant.DefaultTimeout),
+ Weight: url.GetParamInt(constant.WeightKey, constant.DefaultWeight),
+ Username: url.GetParam(constant.OwnerKey, ""),
+ RegistrySource: model.Interface,
+ }
+}
diff --git a/ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go b/pkg/authority/apis/dubbo.apache.org/v1beta1/doc.go
similarity index 100%
rename from ca/pkg/apis/dubbo.apache.org/v1beta1/doc.go
rename to pkg/authority/apis/dubbo.apache.org/v1beta1/doc.go
diff --git a/ca/pkg/apis/dubbo.apache.org/v1beta1/register.go b/pkg/authority/apis/dubbo.apache.org/v1beta1/register.go
similarity index 100%
rename from ca/pkg/apis/dubbo.apache.org/v1beta1/register.go
rename to pkg/authority/apis/dubbo.apache.org/v1beta1/register.go
diff --git a/ca/pkg/apis/dubbo.apache.org/v1beta1/type.go b/pkg/authority/apis/dubbo.apache.org/v1beta1/type.go
similarity index 100%
rename from ca/pkg/apis/dubbo.apache.org/v1beta1/type.go
rename to pkg/authority/apis/dubbo.apache.org/v1beta1/type.go
diff --git a/ca/pkg/apis/dubbo.apache.org/v1beta1/zz_generated.deepcopy.go b/pkg/authority/apis/dubbo.apache.org/v1beta1/zz_generated.deepcopy.go
similarity index 100%
rename from ca/pkg/apis/dubbo.apache.org/v1beta1/zz_generated.deepcopy.go
rename to pkg/authority/apis/dubbo.apache.org/v1beta1/zz_generated.deepcopy.go
diff --git a/ca/pkg/cert/storage.go b/pkg/authority/cert/storage.go
similarity index 97%
rename from ca/pkg/cert/storage.go
rename to pkg/authority/cert/storage.go
index 27c3af6..84001f9 100644
--- a/ca/pkg/cert/storage.go
+++ b/pkg/authority/cert/storage.go
@@ -19,8 +19,8 @@ import (
"crypto/rsa"
"crypto/tls"
"crypto/x509"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
"math"
"os"
"reflect"
diff --git a/ca/pkg/cert/storage_test.go b/pkg/authority/cert/storage_test.go
similarity index 97%
rename from ca/pkg/cert/storage_test.go
rename to pkg/authority/cert/storage_test.go
index 7139b9f..bede52e 100644
--- a/ca/pkg/cert/storage_test.go
+++ b/pkg/authority/cert/storage_test.go
@@ -19,8 +19,8 @@ import (
"crypto/rand"
"crypto/rsa"
"crypto/x509"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
"os"
"reflect"
"sync"
diff --git a/ca/pkg/cert/util.go b/pkg/authority/cert/util.go
similarity index 99%
rename from ca/pkg/cert/util.go
rename to pkg/authority/cert/util.go
index 2dc1e12..ce1bc9b 100644
--- a/ca/pkg/cert/util.go
+++ b/pkg/authority/cert/util.go
@@ -22,7 +22,7 @@ import (
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
"log"
"math/big"
"time"
diff --git a/ca/pkg/cert/util_test.go b/pkg/authority/cert/util_test.go
similarity index 100%
rename from ca/pkg/cert/util_test.go
rename to pkg/authority/cert/util_test.go
diff --git a/ca/pkg/config/options.go b/pkg/authority/config/options.go
similarity index 100%
rename from ca/pkg/config/options.go
rename to pkg/authority/config/options.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicy.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicy.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicy.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicy.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyextend.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyextend.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyextend.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyextend.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyrule.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyrule.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyrule.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyrule.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicysource.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicysource.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicysource.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicysource.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyspec.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyspec.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyspec.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicyspec.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicytarget.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicytarget.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicytarget.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authenticationpolicytarget.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicy.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicy.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicy.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicy.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicycondition.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicycondition.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicycondition.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicycondition.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyextend.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyextend.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyextend.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyextend.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicymatch.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicymatch.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicymatch.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicymatch.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyrule.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyrule.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyrule.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyrule.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicysource.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicysource.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicysource.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicysource.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyspec.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyspec.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyspec.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicyspec.go
diff --git a/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicytarget.go b/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicytarget.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicytarget.go
rename to pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1/authorizationpolicytarget.go
diff --git a/ca/pkg/generated/applyconfiguration/internal/internal.go b/pkg/authority/generated/applyconfiguration/internal/internal.go
similarity index 100%
rename from ca/pkg/generated/applyconfiguration/internal/internal.go
rename to pkg/authority/generated/applyconfiguration/internal/internal.go
diff --git a/ca/pkg/generated/applyconfiguration/utils.go b/pkg/authority/generated/applyconfiguration/utils.go
similarity index 63%
rename from ca/pkg/generated/applyconfiguration/utils.go
rename to pkg/authority/generated/applyconfiguration/utils.go
index 22f7c42..91565bf 100644
--- a/ca/pkg/generated/applyconfiguration/utils.go
+++ b/pkg/authority/generated/applyconfiguration/utils.go
@@ -18,8 +18,8 @@
package applyconfiguration
import (
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ v1beta12 "github.com/apache/dubbo-admin/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1"
schema "k8s.io/apimachinery/pkg/runtime/schema"
)
@@ -29,33 +29,33 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
switch kind {
// Group=dubbo.apache.org, Version=v1beta1
case v1beta1.SchemeGroupVersion.WithKind("AuthenticationPolicy"):
- return &dubboapacheorgv1beta1.AuthenticationPolicyApplyConfiguration{}
+ return &v1beta12.AuthenticationPolicyApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthenticationPolicyExtend"):
- return &dubboapacheorgv1beta1.AuthenticationPolicyExtendApplyConfiguration{}
+ return &v1beta12.AuthenticationPolicyExtendApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthenticationPolicyRule"):
- return &dubboapacheorgv1beta1.AuthenticationPolicyRuleApplyConfiguration{}
+ return &v1beta12.AuthenticationPolicyRuleApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthenticationPolicySource"):
- return &dubboapacheorgv1beta1.AuthenticationPolicySourceApplyConfiguration{}
+ return &v1beta12.AuthenticationPolicySourceApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthenticationPolicySpec"):
- return &dubboapacheorgv1beta1.AuthenticationPolicySpecApplyConfiguration{}
+ return &v1beta12.AuthenticationPolicySpecApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthenticationPolicyTarget"):
- return &dubboapacheorgv1beta1.AuthenticationPolicyTargetApplyConfiguration{}
+ return &v1beta12.AuthenticationPolicyTargetApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicy"):
- return &dubboapacheorgv1beta1.AuthorizationPolicyApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicyApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicyCondition"):
- return &dubboapacheorgv1beta1.AuthorizationPolicyConditionApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicyConditionApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicyExtend"):
- return &dubboapacheorgv1beta1.AuthorizationPolicyExtendApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicyExtendApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicyMatch"):
- return &dubboapacheorgv1beta1.AuthorizationPolicyMatchApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicyMatchApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicyRule"):
- return &dubboapacheorgv1beta1.AuthorizationPolicyRuleApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicyRuleApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicySource"):
- return &dubboapacheorgv1beta1.AuthorizationPolicySourceApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicySourceApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicySpec"):
- return &dubboapacheorgv1beta1.AuthorizationPolicySpecApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicySpecApplyConfiguration{}
case v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicyTarget"):
- return &dubboapacheorgv1beta1.AuthorizationPolicyTargetApplyConfiguration{}
+ return &v1beta12.AuthorizationPolicyTargetApplyConfiguration{}
}
return nil
diff --git a/ca/pkg/generated/clientset/versioned/clientset.go b/pkg/authority/generated/clientset/versioned/clientset.go
similarity index 97%
rename from ca/pkg/generated/clientset/versioned/clientset.go
rename to pkg/authority/generated/clientset/versioned/clientset.go
index b6938ac..d7e9259 100644
--- a/ca/pkg/generated/clientset/versioned/clientset.go
+++ b/pkg/authority/generated/clientset/versioned/clientset.go
@@ -19,9 +19,9 @@ package versioned
import (
"fmt"
+ dubbov1beta1 "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1"
"net/http"
- dubbov1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1"
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol"
diff --git a/ca/pkg/generated/clientset/versioned/fake/clientset_generated.go b/pkg/authority/generated/clientset/versioned/fake/clientset_generated.go
similarity index 89%
rename from ca/pkg/generated/clientset/versioned/fake/clientset_generated.go
rename to pkg/authority/generated/clientset/versioned/fake/clientset_generated.go
index 580e6e4..4f7a265 100644
--- a/ca/pkg/generated/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/authority/generated/clientset/versioned/fake/clientset_generated.go
@@ -18,9 +18,9 @@
package fake
import (
- clientset "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned"
- dubbov1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1"
- fakedubbov1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake"
+ clientset "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned"
+ dubbov1beta1 "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1"
+ fakedubbov1beta1 "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
diff --git a/ca/pkg/generated/clientset/versioned/fake/doc.go b/pkg/authority/generated/clientset/versioned/fake/doc.go
similarity index 100%
rename from ca/pkg/generated/clientset/versioned/fake/doc.go
rename to pkg/authority/generated/clientset/versioned/fake/doc.go
diff --git a/ca/pkg/generated/clientset/versioned/fake/register.go b/pkg/authority/generated/clientset/versioned/fake/register.go
similarity index 95%
rename from ca/pkg/generated/clientset/versioned/fake/register.go
rename to pkg/authority/generated/clientset/versioned/fake/register.go
index 47713b3..6751e2f 100644
--- a/ca/pkg/generated/clientset/versioned/fake/register.go
+++ b/pkg/authority/generated/clientset/versioned/fake/register.go
@@ -18,7 +18,7 @@
package fake
import (
- dubbov1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
+ dubbov1beta1 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/ca/pkg/generated/clientset/versioned/scheme/doc.go b/pkg/authority/generated/clientset/versioned/scheme/doc.go
similarity index 100%
rename from ca/pkg/generated/clientset/versioned/scheme/doc.go
rename to pkg/authority/generated/clientset/versioned/scheme/doc.go
diff --git a/ca/pkg/generated/clientset/versioned/scheme/register.go b/pkg/authority/generated/clientset/versioned/scheme/register.go
similarity index 95%
rename from ca/pkg/generated/clientset/versioned/scheme/register.go
rename to pkg/authority/generated/clientset/versioned/scheme/register.go
index 09f9510..ffdcf26 100644
--- a/ca/pkg/generated/clientset/versioned/scheme/register.go
+++ b/pkg/authority/generated/clientset/versioned/scheme/register.go
@@ -18,7 +18,7 @@
package scheme
import (
- dubbov1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
+ dubbov1beta1 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authenticationpolicy.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authenticationpolicy.go
similarity index 96%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authenticationpolicy.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authenticationpolicy.go
index 8a1e251..9a49ee5 100644
--- a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authenticationpolicy.go
+++ b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authenticationpolicy.go
@@ -21,11 +21,11 @@ import (
"context"
json "encoding/json"
"fmt"
+ "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned/scheme"
"time"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1"
- scheme "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned/scheme"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authorizationpolicy.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authorizationpolicy.go
similarity index 96%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authorizationpolicy.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authorizationpolicy.go
index 29ba157..6ee34ce 100644
--- a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authorizationpolicy.go
+++ b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/authorizationpolicy.go
@@ -21,11 +21,11 @@ import (
"context"
json "encoding/json"
"fmt"
+ "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned/scheme"
"time"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1"
- scheme "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned/scheme"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/doc.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/doc.go
similarity index 100%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/doc.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/doc.go
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/dubbo.apache.org_client.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/dubbo.apache.org_client.go
similarity index 95%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/dubbo.apache.org_client.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/dubbo.apache.org_client.go
index 5ac7eeb..4d3f676 100644
--- a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/dubbo.apache.org_client.go
+++ b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/dubbo.apache.org_client.go
@@ -18,10 +18,10 @@
package v1beta1
import (
+ "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned/scheme"
"net/http"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned/scheme"
rest "k8s.io/client-go/rest"
)
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/doc.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/doc.go
similarity index 100%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/doc.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/doc.go
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authenticationpolicy.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authenticationpolicy.go
similarity index 70%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authenticationpolicy.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authenticationpolicy.go
index 0d755bc..e5e9e1d 100644
--- a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authenticationpolicy.go
+++ b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authenticationpolicy.go
@@ -21,9 +21,9 @@ import (
"context"
json "encoding/json"
"fmt"
+ v1beta12 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
types "k8s.io/apimachinery/pkg/types"
@@ -37,25 +37,25 @@ type FakeAuthenticationPolicies struct {
ns string
}
-var authenticationpoliciesResource = v1beta1.SchemeGroupVersion.WithResource("authenticationpolicies")
+var authenticationpoliciesResource = v1beta12.SchemeGroupVersion.WithResource("authenticationpolicies")
-var authenticationpoliciesKind = v1beta1.SchemeGroupVersion.WithKind("AuthenticationPolicy")
+var authenticationpoliciesKind = v1beta12.SchemeGroupVersion.WithKind("AuthenticationPolicy")
// Get takes name of the authenticationPolicy, and returns the corresponding authenticationPolicy object, and an error if there is any.
-func (c *FakeAuthenticationPolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.AuthenticationPolicy, err error) {
+func (c *FakeAuthenticationPolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta12.AuthenticationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewGetAction(authenticationpoliciesResource, c.ns, name), &v1beta1.AuthenticationPolicy{})
+ Invokes(testing.NewGetAction(authenticationpoliciesResource, c.ns, name), &v1beta12.AuthenticationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthenticationPolicy), err
+ return obj.(*v1beta12.AuthenticationPolicy), err
}
// List takes label and field selectors, and returns the list of AuthenticationPolicies that match those selectors.
-func (c *FakeAuthenticationPolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.AuthenticationPolicyList, err error) {
+func (c *FakeAuthenticationPolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1beta12.AuthenticationPolicyList, err error) {
obj, err := c.Fake.
- Invokes(testing.NewListAction(authenticationpoliciesResource, authenticationpoliciesKind, c.ns, opts), &v1beta1.AuthenticationPolicyList{})
+ Invokes(testing.NewListAction(authenticationpoliciesResource, authenticationpoliciesKind, c.ns, opts), &v1beta12.AuthenticationPolicyList{})
if obj == nil {
return nil, err
@@ -65,8 +65,8 @@ func (c *FakeAuthenticationPolicies) List(ctx context.Context, opts v1.ListOptio
if label == nil {
label = labels.Everything()
}
- list := &v1beta1.AuthenticationPolicyList{ListMeta: obj.(*v1beta1.AuthenticationPolicyList).ListMeta}
- for _, item := range obj.(*v1beta1.AuthenticationPolicyList).Items {
+ list := &v1beta12.AuthenticationPolicyList{ListMeta: obj.(*v1beta12.AuthenticationPolicyList).ListMeta}
+ for _, item := range obj.(*v1beta12.AuthenticationPolicyList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
}
@@ -82,31 +82,31 @@ func (c *FakeAuthenticationPolicies) Watch(ctx context.Context, opts v1.ListOpti
}
// Create takes the representation of a authenticationPolicy and creates it. Returns the server's representation of the authenticationPolicy, and an error, if there is any.
-func (c *FakeAuthenticationPolicies) Create(ctx context.Context, authenticationPolicy *v1beta1.AuthenticationPolicy, opts v1.CreateOptions) (result *v1beta1.AuthenticationPolicy, err error) {
+func (c *FakeAuthenticationPolicies) Create(ctx context.Context, authenticationPolicy *v1beta12.AuthenticationPolicy, opts v1.CreateOptions) (result *v1beta12.AuthenticationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewCreateAction(authenticationpoliciesResource, c.ns, authenticationPolicy), &v1beta1.AuthenticationPolicy{})
+ Invokes(testing.NewCreateAction(authenticationpoliciesResource, c.ns, authenticationPolicy), &v1beta12.AuthenticationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthenticationPolicy), err
+ return obj.(*v1beta12.AuthenticationPolicy), err
}
// Update takes the representation of a authenticationPolicy and updates it. Returns the server's representation of the authenticationPolicy, and an error, if there is any.
-func (c *FakeAuthenticationPolicies) Update(ctx context.Context, authenticationPolicy *v1beta1.AuthenticationPolicy, opts v1.UpdateOptions) (result *v1beta1.AuthenticationPolicy, err error) {
+func (c *FakeAuthenticationPolicies) Update(ctx context.Context, authenticationPolicy *v1beta12.AuthenticationPolicy, opts v1.UpdateOptions) (result *v1beta12.AuthenticationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewUpdateAction(authenticationpoliciesResource, c.ns, authenticationPolicy), &v1beta1.AuthenticationPolicy{})
+ Invokes(testing.NewUpdateAction(authenticationpoliciesResource, c.ns, authenticationPolicy), &v1beta12.AuthenticationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthenticationPolicy), err
+ return obj.(*v1beta12.AuthenticationPolicy), err
}
// Delete takes name of the authenticationPolicy and deletes it. Returns an error if one occurs.
func (c *FakeAuthenticationPolicies) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
_, err := c.Fake.
- Invokes(testing.NewDeleteActionWithOptions(authenticationpoliciesResource, c.ns, name, opts), &v1beta1.AuthenticationPolicy{})
+ Invokes(testing.NewDeleteActionWithOptions(authenticationpoliciesResource, c.ns, name, opts), &v1beta12.AuthenticationPolicy{})
return err
}
@@ -115,23 +115,23 @@ func (c *FakeAuthenticationPolicies) Delete(ctx context.Context, name string, op
func (c *FakeAuthenticationPolicies) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(authenticationpoliciesResource, c.ns, listOpts)
- _, err := c.Fake.Invokes(action, &v1beta1.AuthenticationPolicyList{})
+ _, err := c.Fake.Invokes(action, &v1beta12.AuthenticationPolicyList{})
return err
}
// Patch applies the patch and returns the patched authenticationPolicy.
-func (c *FakeAuthenticationPolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.AuthenticationPolicy, err error) {
+func (c *FakeAuthenticationPolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta12.AuthenticationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(authenticationpoliciesResource, c.ns, name, pt, data, subresources...), &v1beta1.AuthenticationPolicy{})
+ Invokes(testing.NewPatchSubresourceAction(authenticationpoliciesResource, c.ns, name, pt, data, subresources...), &v1beta12.AuthenticationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthenticationPolicy), err
+ return obj.(*v1beta12.AuthenticationPolicy), err
}
// Apply takes the given apply declarative configuration, applies it and returns the applied authenticationPolicy.
-func (c *FakeAuthenticationPolicies) Apply(ctx context.Context, authenticationPolicy *dubboapacheorgv1beta1.AuthenticationPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.AuthenticationPolicy, err error) {
+func (c *FakeAuthenticationPolicies) Apply(ctx context.Context, authenticationPolicy *dubboapacheorgv1beta1.AuthenticationPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1beta12.AuthenticationPolicy, err error) {
if authenticationPolicy == nil {
return nil, fmt.Errorf("authenticationPolicy provided to Apply must not be nil")
}
@@ -144,10 +144,10 @@ func (c *FakeAuthenticationPolicies) Apply(ctx context.Context, authenticationPo
return nil, fmt.Errorf("authenticationPolicy.Name must be provided to Apply")
}
obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(authenticationpoliciesResource, c.ns, *name, types.ApplyPatchType, data), &v1beta1.AuthenticationPolicy{})
+ Invokes(testing.NewPatchSubresourceAction(authenticationpoliciesResource, c.ns, *name, types.ApplyPatchType, data), &v1beta12.AuthenticationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthenticationPolicy), err
+ return obj.(*v1beta12.AuthenticationPolicy), err
}
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authorizationpolicy.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authorizationpolicy.go
similarity index 70%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authorizationpolicy.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authorizationpolicy.go
index 98c92b0..f642b7f 100644
--- a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authorizationpolicy.go
+++ b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_authorizationpolicy.go
@@ -21,9 +21,9 @@ import (
"context"
json "encoding/json"
"fmt"
+ v1beta12 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/pkg/authority/generated/applyconfiguration/dubbo.apache.org/v1beta1"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/applyconfiguration/dubbo.apache.org/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
types "k8s.io/apimachinery/pkg/types"
@@ -37,25 +37,25 @@ type FakeAuthorizationPolicies struct {
ns string
}
-var authorizationpoliciesResource = v1beta1.SchemeGroupVersion.WithResource("authorizationpolicies")
+var authorizationpoliciesResource = v1beta12.SchemeGroupVersion.WithResource("authorizationpolicies")
-var authorizationpoliciesKind = v1beta1.SchemeGroupVersion.WithKind("AuthorizationPolicy")
+var authorizationpoliciesKind = v1beta12.SchemeGroupVersion.WithKind("AuthorizationPolicy")
// Get takes name of the authorizationPolicy, and returns the corresponding authorizationPolicy object, and an error if there is any.
-func (c *FakeAuthorizationPolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.AuthorizationPolicy, err error) {
+func (c *FakeAuthorizationPolicies) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta12.AuthorizationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewGetAction(authorizationpoliciesResource, c.ns, name), &v1beta1.AuthorizationPolicy{})
+ Invokes(testing.NewGetAction(authorizationpoliciesResource, c.ns, name), &v1beta12.AuthorizationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthorizationPolicy), err
+ return obj.(*v1beta12.AuthorizationPolicy), err
}
// List takes label and field selectors, and returns the list of AuthorizationPolicies that match those selectors.
-func (c *FakeAuthorizationPolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.AuthorizationPolicyList, err error) {
+func (c *FakeAuthorizationPolicies) List(ctx context.Context, opts v1.ListOptions) (result *v1beta12.AuthorizationPolicyList, err error) {
obj, err := c.Fake.
- Invokes(testing.NewListAction(authorizationpoliciesResource, authorizationpoliciesKind, c.ns, opts), &v1beta1.AuthorizationPolicyList{})
+ Invokes(testing.NewListAction(authorizationpoliciesResource, authorizationpoliciesKind, c.ns, opts), &v1beta12.AuthorizationPolicyList{})
if obj == nil {
return nil, err
@@ -65,8 +65,8 @@ func (c *FakeAuthorizationPolicies) List(ctx context.Context, opts v1.ListOption
if label == nil {
label = labels.Everything()
}
- list := &v1beta1.AuthorizationPolicyList{ListMeta: obj.(*v1beta1.AuthorizationPolicyList).ListMeta}
- for _, item := range obj.(*v1beta1.AuthorizationPolicyList).Items {
+ list := &v1beta12.AuthorizationPolicyList{ListMeta: obj.(*v1beta12.AuthorizationPolicyList).ListMeta}
+ for _, item := range obj.(*v1beta12.AuthorizationPolicyList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
}
@@ -82,31 +82,31 @@ func (c *FakeAuthorizationPolicies) Watch(ctx context.Context, opts v1.ListOptio
}
// Create takes the representation of a authorizationPolicy and creates it. Returns the server's representation of the authorizationPolicy, and an error, if there is any.
-func (c *FakeAuthorizationPolicies) Create(ctx context.Context, authorizationPolicy *v1beta1.AuthorizationPolicy, opts v1.CreateOptions) (result *v1beta1.AuthorizationPolicy, err error) {
+func (c *FakeAuthorizationPolicies) Create(ctx context.Context, authorizationPolicy *v1beta12.AuthorizationPolicy, opts v1.CreateOptions) (result *v1beta12.AuthorizationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewCreateAction(authorizationpoliciesResource, c.ns, authorizationPolicy), &v1beta1.AuthorizationPolicy{})
+ Invokes(testing.NewCreateAction(authorizationpoliciesResource, c.ns, authorizationPolicy), &v1beta12.AuthorizationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthorizationPolicy), err
+ return obj.(*v1beta12.AuthorizationPolicy), err
}
// Update takes the representation of a authorizationPolicy and updates it. Returns the server's representation of the authorizationPolicy, and an error, if there is any.
-func (c *FakeAuthorizationPolicies) Update(ctx context.Context, authorizationPolicy *v1beta1.AuthorizationPolicy, opts v1.UpdateOptions) (result *v1beta1.AuthorizationPolicy, err error) {
+func (c *FakeAuthorizationPolicies) Update(ctx context.Context, authorizationPolicy *v1beta12.AuthorizationPolicy, opts v1.UpdateOptions) (result *v1beta12.AuthorizationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewUpdateAction(authorizationpoliciesResource, c.ns, authorizationPolicy), &v1beta1.AuthorizationPolicy{})
+ Invokes(testing.NewUpdateAction(authorizationpoliciesResource, c.ns, authorizationPolicy), &v1beta12.AuthorizationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthorizationPolicy), err
+ return obj.(*v1beta12.AuthorizationPolicy), err
}
// Delete takes name of the authorizationPolicy and deletes it. Returns an error if one occurs.
func (c *FakeAuthorizationPolicies) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
_, err := c.Fake.
- Invokes(testing.NewDeleteActionWithOptions(authorizationpoliciesResource, c.ns, name, opts), &v1beta1.AuthorizationPolicy{})
+ Invokes(testing.NewDeleteActionWithOptions(authorizationpoliciesResource, c.ns, name, opts), &v1beta12.AuthorizationPolicy{})
return err
}
@@ -115,23 +115,23 @@ func (c *FakeAuthorizationPolicies) Delete(ctx context.Context, name string, opt
func (c *FakeAuthorizationPolicies) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(authorizationpoliciesResource, c.ns, listOpts)
- _, err := c.Fake.Invokes(action, &v1beta1.AuthorizationPolicyList{})
+ _, err := c.Fake.Invokes(action, &v1beta12.AuthorizationPolicyList{})
return err
}
// Patch applies the patch and returns the patched authorizationPolicy.
-func (c *FakeAuthorizationPolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.AuthorizationPolicy, err error) {
+func (c *FakeAuthorizationPolicies) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta12.AuthorizationPolicy, err error) {
obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(authorizationpoliciesResource, c.ns, name, pt, data, subresources...), &v1beta1.AuthorizationPolicy{})
+ Invokes(testing.NewPatchSubresourceAction(authorizationpoliciesResource, c.ns, name, pt, data, subresources...), &v1beta12.AuthorizationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthorizationPolicy), err
+ return obj.(*v1beta12.AuthorizationPolicy), err
}
// Apply takes the given apply declarative configuration, applies it and returns the applied authorizationPolicy.
-func (c *FakeAuthorizationPolicies) Apply(ctx context.Context, authorizationPolicy *dubboapacheorgv1beta1.AuthorizationPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1beta1.AuthorizationPolicy, err error) {
+func (c *FakeAuthorizationPolicies) Apply(ctx context.Context, authorizationPolicy *dubboapacheorgv1beta1.AuthorizationPolicyApplyConfiguration, opts v1.ApplyOptions) (result *v1beta12.AuthorizationPolicy, err error) {
if authorizationPolicy == nil {
return nil, fmt.Errorf("authorizationPolicy provided to Apply must not be nil")
}
@@ -144,10 +144,10 @@ func (c *FakeAuthorizationPolicies) Apply(ctx context.Context, authorizationPoli
return nil, fmt.Errorf("authorizationPolicy.Name must be provided to Apply")
}
obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(authorizationpoliciesResource, c.ns, *name, types.ApplyPatchType, data), &v1beta1.AuthorizationPolicy{})
+ Invokes(testing.NewPatchSubresourceAction(authorizationpoliciesResource, c.ns, *name, types.ApplyPatchType, data), &v1beta12.AuthorizationPolicy{})
if obj == nil {
return nil, err
}
- return obj.(*v1beta1.AuthorizationPolicy), err
+ return obj.(*v1beta12.AuthorizationPolicy), err
}
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_dubbo.apache.org_client.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_dubbo.apache.org_client.go
similarity index 87%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_dubbo.apache.org_client.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_dubbo.apache.org_client.go
index 2940ced..bd7f497 100644
--- a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_dubbo.apache.org_client.go
+++ b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/fake/fake_dubbo.apache.org_client.go
@@ -18,7 +18,7 @@
package fake
import (
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1"
+ v1beta12 "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
@@ -27,11 +27,11 @@ type FakeDubboV1beta1 struct {
*testing.Fake
}
-func (c *FakeDubboV1beta1) AuthenticationPolicies(namespace string) v1beta1.AuthenticationPolicyInterface {
+func (c *FakeDubboV1beta1) AuthenticationPolicies(namespace string) v1beta12.AuthenticationPolicyInterface {
return &FakeAuthenticationPolicies{c, namespace}
}
-func (c *FakeDubboV1beta1) AuthorizationPolicies(namespace string) v1beta1.AuthorizationPolicyInterface {
+func (c *FakeDubboV1beta1) AuthorizationPolicies(namespace string) v1beta12.AuthorizationPolicyInterface {
return &FakeAuthorizationPolicies{c, namespace}
}
diff --git a/ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/generated_expansion.go b/pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/generated_expansion.go
similarity index 100%
rename from ca/pkg/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/generated_expansion.go
rename to pkg/authority/generated/clientset/versioned/typed/dubbo.apache.org/v1beta1/generated_expansion.go
diff --git a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/interface.go b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/interface.go
similarity index 87%
rename from ca/pkg/generated/informers/externalversions/dubbo.apache.org/interface.go
rename to pkg/authority/generated/informers/externalversions/dubbo.apache.org/interface.go
index 24a7c42..1b6fd94 100644
--- a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/interface.go
+++ b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/interface.go
@@ -18,8 +18,8 @@
package dubbo
import (
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1"
- internalinterfaces "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/internalinterfaces"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/internalinterfaces"
)
// Interface provides access to each of this group's versions.
diff --git a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/authenticationpolicy.go b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/authenticationpolicy.go
similarity index 90%
rename from ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/authenticationpolicy.go
rename to pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/authenticationpolicy.go
index b31b6a6..ffd00b5 100644
--- a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/authenticationpolicy.go
+++ b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/authenticationpolicy.go
@@ -19,12 +19,12 @@ package v1beta1
import (
"context"
+ dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/internalinterfaces"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/listers/dubbo.apache.org/v1beta1"
time "time"
- dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- versioned "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned"
- internalinterfaces "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/internalinterfaces"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/listers/dubbo.apache.org/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/authorizationpolicy.go b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/authorizationpolicy.go
similarity index 90%
rename from ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/authorizationpolicy.go
rename to pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/authorizationpolicy.go
index a1c1215..c620037 100644
--- a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/authorizationpolicy.go
+++ b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/authorizationpolicy.go
@@ -19,12 +19,12 @@ package v1beta1
import (
"context"
+ dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/internalinterfaces"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/listers/dubbo.apache.org/v1beta1"
time "time"
- dubboapacheorgv1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- versioned "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned"
- internalinterfaces "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/internalinterfaces"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/generated/listers/dubbo.apache.org/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
diff --git a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/interface.go b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/interface.go
similarity index 94%
rename from ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/interface.go
rename to pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/interface.go
index 5b2c656..a4dab2a 100644
--- a/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1/interface.go
+++ b/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1/interface.go
@@ -18,7 +18,7 @@
package v1beta1
import (
- internalinterfaces "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/internalinterfaces"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/internalinterfaces"
)
// Interface provides access to all the informers in this group version.
diff --git a/ca/pkg/generated/informers/externalversions/factory.go b/pkg/authority/generated/informers/externalversions/factory.go
similarity index 96%
rename from ca/pkg/generated/informers/externalversions/factory.go
rename to pkg/authority/generated/informers/externalversions/factory.go
index e2425f7..b97e085 100644
--- a/ca/pkg/generated/informers/externalversions/factory.go
+++ b/pkg/authority/generated/informers/externalversions/factory.go
@@ -18,13 +18,13 @@
package externalversions
import (
+ "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned"
+ dubboapacheorg "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/dubbo.apache.org"
+ "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/internalinterfaces"
reflect "reflect"
sync "sync"
time "time"
- versioned "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned"
- dubboapacheorg "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/dubbo.apache.org"
- internalinterfaces "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/internalinterfaces"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/ca/pkg/generated/informers/externalversions/generic.go b/pkg/authority/generated/informers/externalversions/generic.go
similarity index 96%
rename from ca/pkg/generated/informers/externalversions/generic.go
rename to pkg/authority/generated/informers/externalversions/generic.go
index 0536bc5..0bc02fc 100644
--- a/ca/pkg/generated/informers/externalversions/generic.go
+++ b/pkg/authority/generated/informers/externalversions/generic.go
@@ -19,8 +19,8 @@ package externalversions
import (
"fmt"
+ "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
schema "k8s.io/apimachinery/pkg/runtime/schema"
cache "k8s.io/client-go/tools/cache"
)
diff --git a/ca/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/authority/generated/informers/externalversions/internalinterfaces/factory_interfaces.go
similarity index 95%
rename from ca/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go
rename to pkg/authority/generated/informers/externalversions/internalinterfaces/factory_interfaces.go
index eb1b8d7..d419a0b 100644
--- a/ca/pkg/generated/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/authority/generated/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -18,9 +18,9 @@
package internalinterfaces
import (
+ "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned"
time "time"
- versioned "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
cache "k8s.io/client-go/tools/cache"
diff --git a/ca/pkg/generated/listers/dubbo.apache.org/v1beta1/authenticationpolicy.go b/pkg/authority/generated/listers/dubbo.apache.org/v1beta1/authenticationpolicy.go
similarity index 83%
rename from ca/pkg/generated/listers/dubbo.apache.org/v1beta1/authenticationpolicy.go
rename to pkg/authority/generated/listers/dubbo.apache.org/v1beta1/authenticationpolicy.go
index a2f41dc..79de497 100644
--- a/ca/pkg/generated/listers/dubbo.apache.org/v1beta1/authenticationpolicy.go
+++ b/pkg/authority/generated/listers/dubbo.apache.org/v1beta1/authenticationpolicy.go
@@ -18,7 +18,7 @@
package v1beta1
import (
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
+ v1beta12 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
@@ -29,7 +29,7 @@ import (
type AuthenticationPolicyLister interface {
// List lists all AuthenticationPolicies in the indexer.
// Objects returned here must be treated as read-only.
- List(selector labels.Selector) (ret []*v1beta1.AuthenticationPolicy, err error)
+ List(selector labels.Selector) (ret []*v1beta12.AuthenticationPolicy, err error)
// AuthenticationPolicies returns an object that can list and get AuthenticationPolicies.
AuthenticationPolicies(namespace string) AuthenticationPolicyNamespaceLister
AuthenticationPolicyListerExpansion
@@ -46,9 +46,9 @@ func NewAuthenticationPolicyLister(indexer cache.Indexer) AuthenticationPolicyLi
}
// List lists all AuthenticationPolicies in the indexer.
-func (s *authenticationPolicyLister) List(selector labels.Selector) (ret []*v1beta1.AuthenticationPolicy, err error) {
+func (s *authenticationPolicyLister) List(selector labels.Selector) (ret []*v1beta12.AuthenticationPolicy, err error) {
err = cache.ListAll(s.indexer, selector, func(m interface{}) {
- ret = append(ret, m.(*v1beta1.AuthenticationPolicy))
+ ret = append(ret, m.(*v1beta12.AuthenticationPolicy))
})
return ret, err
}
@@ -63,10 +63,10 @@ func (s *authenticationPolicyLister) AuthenticationPolicies(namespace string) Au
type AuthenticationPolicyNamespaceLister interface {
// List lists all AuthenticationPolicies in the indexer for a given namespace.
// Objects returned here must be treated as read-only.
- List(selector labels.Selector) (ret []*v1beta1.AuthenticationPolicy, err error)
+ List(selector labels.Selector) (ret []*v1beta12.AuthenticationPolicy, err error)
// Get retrieves the AuthenticationPolicy from the indexer for a given namespace and name.
// Objects returned here must be treated as read-only.
- Get(name string) (*v1beta1.AuthenticationPolicy, error)
+ Get(name string) (*v1beta12.AuthenticationPolicy, error)
AuthenticationPolicyNamespaceListerExpansion
}
@@ -78,21 +78,21 @@ type authenticationPolicyNamespaceLister struct {
}
// List lists all AuthenticationPolicies in the indexer for a given namespace.
-func (s authenticationPolicyNamespaceLister) List(selector labels.Selector) (ret []*v1beta1.AuthenticationPolicy, err error) {
+func (s authenticationPolicyNamespaceLister) List(selector labels.Selector) (ret []*v1beta12.AuthenticationPolicy, err error) {
err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
- ret = append(ret, m.(*v1beta1.AuthenticationPolicy))
+ ret = append(ret, m.(*v1beta12.AuthenticationPolicy))
})
return ret, err
}
// Get retrieves the AuthenticationPolicy from the indexer for a given namespace and name.
-func (s authenticationPolicyNamespaceLister) Get(name string) (*v1beta1.AuthenticationPolicy, error) {
+func (s authenticationPolicyNamespaceLister) Get(name string) (*v1beta12.AuthenticationPolicy, error) {
obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
if err != nil {
return nil, err
}
if !exists {
- return nil, errors.NewNotFound(v1beta1.Resource("authenticationpolicy"), name)
+ return nil, errors.NewNotFound(v1beta12.Resource("authenticationpolicy"), name)
}
- return obj.(*v1beta1.AuthenticationPolicy), nil
+ return obj.(*v1beta12.AuthenticationPolicy), nil
}
diff --git a/ca/pkg/generated/listers/dubbo.apache.org/v1beta1/authorizationpolicy.go b/pkg/authority/generated/listers/dubbo.apache.org/v1beta1/authorizationpolicy.go
similarity index 83%
rename from ca/pkg/generated/listers/dubbo.apache.org/v1beta1/authorizationpolicy.go
rename to pkg/authority/generated/listers/dubbo.apache.org/v1beta1/authorizationpolicy.go
index 0ac92ca..bc230bd 100644
--- a/ca/pkg/generated/listers/dubbo.apache.org/v1beta1/authorizationpolicy.go
+++ b/pkg/authority/generated/listers/dubbo.apache.org/v1beta1/authorizationpolicy.go
@@ -18,7 +18,7 @@
package v1beta1
import (
- v1beta1 "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
+ v1beta12 "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
@@ -29,7 +29,7 @@ import (
type AuthorizationPolicyLister interface {
// List lists all AuthorizationPolicies in the indexer.
// Objects returned here must be treated as read-only.
- List(selector labels.Selector) (ret []*v1beta1.AuthorizationPolicy, err error)
+ List(selector labels.Selector) (ret []*v1beta12.AuthorizationPolicy, err error)
// AuthorizationPolicies returns an object that can list and get AuthorizationPolicies.
AuthorizationPolicies(namespace string) AuthorizationPolicyNamespaceLister
AuthorizationPolicyListerExpansion
@@ -46,9 +46,9 @@ func NewAuthorizationPolicyLister(indexer cache.Indexer) AuthorizationPolicyList
}
// List lists all AuthorizationPolicies in the indexer.
-func (s *authorizationPolicyLister) List(selector labels.Selector) (ret []*v1beta1.AuthorizationPolicy, err error) {
+func (s *authorizationPolicyLister) List(selector labels.Selector) (ret []*v1beta12.AuthorizationPolicy, err error) {
err = cache.ListAll(s.indexer, selector, func(m interface{}) {
- ret = append(ret, m.(*v1beta1.AuthorizationPolicy))
+ ret = append(ret, m.(*v1beta12.AuthorizationPolicy))
})
return ret, err
}
@@ -63,10 +63,10 @@ func (s *authorizationPolicyLister) AuthorizationPolicies(namespace string) Auth
type AuthorizationPolicyNamespaceLister interface {
// List lists all AuthorizationPolicies in the indexer for a given namespace.
// Objects returned here must be treated as read-only.
- List(selector labels.Selector) (ret []*v1beta1.AuthorizationPolicy, err error)
+ List(selector labels.Selector) (ret []*v1beta12.AuthorizationPolicy, err error)
// Get retrieves the AuthorizationPolicy from the indexer for a given namespace and name.
// Objects returned here must be treated as read-only.
- Get(name string) (*v1beta1.AuthorizationPolicy, error)
+ Get(name string) (*v1beta12.AuthorizationPolicy, error)
AuthorizationPolicyNamespaceListerExpansion
}
@@ -78,21 +78,21 @@ type authorizationPolicyNamespaceLister struct {
}
// List lists all AuthorizationPolicies in the indexer for a given namespace.
-func (s authorizationPolicyNamespaceLister) List(selector labels.Selector) (ret []*v1beta1.AuthorizationPolicy, err error) {
+func (s authorizationPolicyNamespaceLister) List(selector labels.Selector) (ret []*v1beta12.AuthorizationPolicy, err error) {
err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
- ret = append(ret, m.(*v1beta1.AuthorizationPolicy))
+ ret = append(ret, m.(*v1beta12.AuthorizationPolicy))
})
return ret, err
}
// Get retrieves the AuthorizationPolicy from the indexer for a given namespace and name.
-func (s authorizationPolicyNamespaceLister) Get(name string) (*v1beta1.AuthorizationPolicy, error) {
+func (s authorizationPolicyNamespaceLister) Get(name string) (*v1beta12.AuthorizationPolicy, error) {
obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
if err != nil {
return nil, err
}
if !exists {
- return nil, errors.NewNotFound(v1beta1.Resource("authorizationpolicy"), name)
+ return nil, errors.NewNotFound(v1beta12.Resource("authorizationpolicy"), name)
}
- return obj.(*v1beta1.AuthorizationPolicy), nil
+ return obj.(*v1beta12.AuthorizationPolicy), nil
}
diff --git a/ca/pkg/generated/listers/dubbo.apache.org/v1beta1/expansion_generated.go b/pkg/authority/generated/listers/dubbo.apache.org/v1beta1/expansion_generated.go
similarity index 100%
rename from ca/pkg/generated/listers/dubbo.apache.org/v1beta1/expansion_generated.go
rename to pkg/authority/generated/listers/dubbo.apache.org/v1beta1/expansion_generated.go
diff --git a/ca/pkg/k8s/client.go b/pkg/authority/k8s/client.go
similarity index 95%
rename from ca/pkg/k8s/client.go
rename to pkg/authority/k8s/client.go
index e264478..6cc3b05 100644
--- a/ca/pkg/k8s/client.go
+++ b/pkg/authority/k8s/client.go
@@ -18,19 +18,19 @@ package k8s
import (
"context"
"flag"
- "github.com/apache/dubbo-admin/ca/pkg/cert"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
- "github.com/apache/dubbo-admin/ca/pkg/rule/authentication"
- "github.com/apache/dubbo-admin/ca/pkg/rule/authorization"
+ "github.com/apache/dubbo-admin/pkg/authority/cert"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ infoemerclient "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned"
+ informers "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
+ "github.com/apache/dubbo-admin/pkg/authority/rule/authentication"
+ "github.com/apache/dubbo-admin/pkg/authority/rule/authorization"
admissionregistrationV1 "k8s.io/api/admissionregistration/v1"
k8sauth "k8s.io/api/authentication/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"time"
- infoemerclient "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned"
- informers "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
diff --git a/ca/pkg/k8s/controller.go b/pkg/authority/k8s/controller.go
similarity index 79%
rename from ca/pkg/k8s/controller.go
rename to pkg/authority/k8s/controller.go
index 0d26540..c80c164 100644
--- a/ca/pkg/k8s/controller.go
+++ b/pkg/authority/k8s/controller.go
@@ -16,12 +16,12 @@
package k8s
import (
- "github.com/apache/dubbo-admin/ca/pkg/apis/dubbo.apache.org/v1beta1"
- clientset "github.com/apache/dubbo-admin/ca/pkg/generated/clientset/versioned"
- informers "github.com/apache/dubbo-admin/ca/pkg/generated/informers/externalversions/dubbo.apache.org/v1beta1"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
- "github.com/apache/dubbo-admin/ca/pkg/rule/authentication"
- "github.com/apache/dubbo-admin/ca/pkg/rule/authorization"
+ "github.com/apache/dubbo-admin/pkg/authority/apis/dubbo.apache.org/v1beta1"
+ clientset "github.com/apache/dubbo-admin/pkg/authority/generated/clientset/versioned"
+ v1beta12 "github.com/apache/dubbo-admin/pkg/authority/generated/informers/externalversions/dubbo.apache.org/v1beta1"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
+ authentication2 "github.com/apache/dubbo-admin/pkg/authority/rule/authentication"
+ authorization2 "github.com/apache/dubbo-admin/pkg/authority/rule/authorization"
"k8s.io/client-go/tools/cache"
)
@@ -44,17 +44,17 @@ type Controller struct {
acSynced cache.InformerSynced
apSynced cache.InformerSynced
- acHandler authentication.Handler
- apHandler authorization.Handler
+ acHandler authentication2.Handler
+ apHandler authorization2.Handler
}
// NewController returns a new sample controller
func NewController(
clientSet clientset.Interface,
- acHandler authentication.Handler,
- apHandler authorization.Handler,
- acInformer informers.AuthenticationPolicyInformer,
- apInformer informers.AuthorizationPolicyInformer) *Controller {
+ acHandler authentication2.Handler,
+ apHandler authorization2.Handler,
+ acInformer v1beta12.AuthenticationPolicyInformer,
+ apInformer v1beta12.AuthorizationPolicyInformer) *Controller {
controller := &Controller{
dubboClientSet: clientSet,
@@ -137,15 +137,15 @@ func (c *Controller) handleEvent(obj interface{}, eventType NotificationType) {
}
-func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authentication.Policy {
- a := &authentication.Policy{}
+func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authentication2.Policy {
+ a := &authentication2.Policy{}
a.Name = key
- a.Spec = &authentication.PolicySpec{}
+ a.Spec = &authentication2.PolicySpec{}
a.Spec.Action = pa.Spec.Action
if pa.Spec.Rules != nil {
for _, rule := range pa.Spec.Rules {
- r := &authentication.Rule{
- From: &authentication.Source{
+ r := &authentication2.Rule{
+ From: &authentication2.Source{
Namespaces: rule.From.Namespaces,
NotNamespaces: rule.From.NotNamespaces,
IpBlocks: rule.From.IpBlocks,
@@ -153,7 +153,7 @@ func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authent
Principals: rule.From.Principals,
NotPrincipals: rule.From.NotPrincipals,
},
- To: &authentication.Target{
+ To: &authentication2.Target{
IpBlocks: rule.To.IpBlocks,
NotIpBlocks: rule.To.NotIpBlocks,
Principals: rule.To.Principals,
@@ -162,7 +162,7 @@ func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authent
}
if rule.From.Extends != nil {
for _, extends := range rule.From.Extends {
- r.From.Extends = append(r.From.Extends, &authentication.Extend{
+ r.From.Extends = append(r.From.Extends, &authentication2.Extend{
Key: extends.Key,
Value: extends.Value,
})
@@ -170,7 +170,7 @@ func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authent
}
if rule.From.NotExtends != nil {
for _, notExtend := range rule.From.NotExtends {
- r.From.NotExtends = append(r.From.NotExtends, &authentication.Extend{
+ r.From.NotExtends = append(r.From.NotExtends, &authentication2.Extend{
Key: notExtend.Key,
Value: notExtend.Value,
})
@@ -178,7 +178,7 @@ func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authent
}
if rule.To.Extends != nil {
for _, extends := range rule.To.Extends {
- r.To.Extends = append(r.To.Extends, &authentication.Extend{
+ r.To.Extends = append(r.To.Extends, &authentication2.Extend{
Key: extends.Key,
Value: extends.Value,
})
@@ -186,7 +186,7 @@ func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authent
}
if rule.To.NotExtends != nil {
for _, notExtend := range rule.To.NotExtends {
- r.To.NotExtends = append(r.To.NotExtends, &authentication.Extend{
+ r.To.NotExtends = append(r.To.NotExtends, &authentication2.Extend{
Key: notExtend.Key,
Value: notExtend.Value,
})
@@ -200,15 +200,15 @@ func CopyToAuthentication(key string, pa *v1beta1.AuthenticationPolicy) *authent
return a
}
-func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authorization.Policy {
- a := &authorization.Policy{}
+func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authorization2.Policy {
+ a := &authorization2.Policy{}
a.Name = key
- a.Spec = &authorization.PolicySpec{}
+ a.Spec = &authorization2.PolicySpec{}
a.Spec.Action = pa.Spec.Action
if pa.Spec.Rules != nil {
for _, rule := range pa.Spec.Rules {
- r := &authorization.Rule{
- From: &authorization.Source{
+ r := &authorization2.Rule{
+ From: &authorization2.Source{
Namespaces: rule.From.Namespaces,
NotNamespaces: rule.From.NotNamespaces,
IpBlocks: rule.From.IpBlocks,
@@ -216,19 +216,19 @@ func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authoriza
Principals: rule.From.Principals,
NotPrincipals: rule.From.NotPrincipals,
},
- To: &authorization.Target{
+ To: &authorization2.Target{
IpBlocks: rule.To.IpBlocks,
NotIpBlocks: rule.To.NotIpBlocks,
Principals: rule.To.Principals,
NotPrincipals: rule.To.NotPrincipals,
},
- When: &authorization.Condition{
+ When: &authorization2.Condition{
Key: rule.When.Key,
},
}
if rule.From.Extends != nil {
for _, extends := range rule.From.Extends {
- r.From.Extends = append(r.From.Extends, &authorization.Extend{
+ r.From.Extends = append(r.From.Extends, &authorization2.Extend{
Key: extends.Key,
Value: extends.Value,
})
@@ -236,7 +236,7 @@ func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authoriza
}
if rule.From.NotExtends != nil {
for _, notExtend := range rule.From.NotExtends {
- r.From.NotExtends = append(r.From.NotExtends, &authorization.Extend{
+ r.From.NotExtends = append(r.From.NotExtends, &authorization2.Extend{
Key: notExtend.Key,
Value: notExtend.Value,
})
@@ -244,7 +244,7 @@ func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authoriza
}
if rule.To.Extends != nil {
for _, extends := range rule.To.Extends {
- r.To.Extends = append(r.To.Extends, &authorization.Extend{
+ r.To.Extends = append(r.To.Extends, &authorization2.Extend{
Key: extends.Key,
Value: extends.Value,
})
@@ -252,7 +252,7 @@ func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authoriza
}
if rule.To.NotExtends != nil {
for _, notExtend := range rule.To.NotExtends {
- r.To.NotExtends = append(r.To.NotExtends, &authorization.Extend{
+ r.To.NotExtends = append(r.To.NotExtends, &authorization2.Extend{
Key: notExtend.Key,
Value: notExtend.Value,
})
@@ -260,7 +260,7 @@ func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authoriza
}
if rule.When.Values != nil {
for _, value := range rule.When.Values {
- r.When.Values = append(r.When.Values, &authorization.Match{
+ r.When.Values = append(r.When.Values, &authorization2.Match{
Type: value.Type,
Value: value.Value,
})
@@ -268,7 +268,7 @@ func CopyToAuthorization(key string, pa *v1beta1.AuthorizationPolicy) *authoriza
}
if rule.When.NotValues != nil {
for _, notValue := range rule.When.NotValues {
- r.When.Values = append(r.When.Values, &authorization.Match{
+ r.When.Values = append(r.When.Values, &authorization2.Match{
Type: notValue.Type,
Value: notValue.Value,
})
diff --git a/ca/pkg/k8s/controller_test.go b/pkg/authority/k8s/controller_test.go
similarity index 100%
rename from ca/pkg/k8s/controller_test.go
rename to pkg/authority/k8s/controller_test.go
diff --git a/ca/pkg/logger/log.go b/pkg/authority/logger/log.go
similarity index 100%
rename from ca/pkg/logger/log.go
rename to pkg/authority/logger/log.go
diff --git a/ca/pkg/patch/javasdk.go b/pkg/authority/patch/javasdk.go
similarity index 97%
rename from ca/pkg/patch/javasdk.go
rename to pkg/authority/patch/javasdk.go
index c551fc5..30a2efc 100644
--- a/ca/pkg/patch/javasdk.go
+++ b/pkg/authority/patch/javasdk.go
@@ -16,8 +16,8 @@
package patch
import (
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/k8s"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/k8s"
v1 "k8s.io/api/core/v1"
"strconv"
)
diff --git a/ca/pkg/patch/javasdk_test.go b/pkg/authority/patch/javasdk_test.go
similarity index 98%
rename from ca/pkg/patch/javasdk_test.go
rename to pkg/authority/patch/javasdk_test.go
index 6b693cf..169ccad 100644
--- a/ca/pkg/patch/javasdk_test.go
+++ b/pkg/authority/patch/javasdk_test.go
@@ -17,7 +17,7 @@ package patch
import (
"encoding/json"
- "github.com/apache/dubbo-admin/ca/pkg/config"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
"github.com/mattbaird/jsonpatch"
v1 "k8s.io/api/core/v1"
"testing"
diff --git a/ca/pkg/rule/authentication/definition.go b/pkg/authority/rule/authentication/definition.go
similarity index 100%
rename from ca/pkg/rule/authentication/definition.go
rename to pkg/authority/rule/authentication/definition.go
diff --git a/ca/pkg/rule/authentication/handler.go b/pkg/authority/rule/authentication/handler.go
similarity index 100%
rename from ca/pkg/rule/authentication/handler.go
rename to pkg/authority/rule/authentication/handler.go
diff --git a/ca/pkg/rule/authorization/definition.go b/pkg/authority/rule/authorization/definition.go
similarity index 100%
rename from ca/pkg/rule/authorization/definition.go
rename to pkg/authority/rule/authorization/definition.go
diff --git a/ca/pkg/rule/authorization/handler.go b/pkg/authority/rule/authorization/handler.go
similarity index 100%
rename from ca/pkg/rule/authorization/handler.go
rename to pkg/authority/rule/authorization/handler.go
diff --git a/ca/pkg/security/server.go b/pkg/authority/security/server.go
similarity index 81%
rename from ca/pkg/security/server.go
rename to pkg/authority/security/server.go
index d40d5b5..f9ac426 100644
--- a/ca/pkg/security/server.go
+++ b/pkg/authority/security/server.go
@@ -17,13 +17,13 @@ package security
import (
"crypto/tls"
- "github.com/apache/dubbo-admin/ca/pkg/cert"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/k8s"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
- "github.com/apache/dubbo-admin/ca/pkg/patch"
- "github.com/apache/dubbo-admin/ca/pkg/v1alpha1"
- "github.com/apache/dubbo-admin/ca/pkg/webhook"
+ cert2 "github.com/apache/dubbo-admin/pkg/authority/cert"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/k8s"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
+ "github.com/apache/dubbo-admin/pkg/authority/patch"
+ v1alpha12 "github.com/apache/dubbo-admin/pkg/authority/v1alpha1"
+ "github.com/apache/dubbo-admin/pkg/authority/webhook"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/reflection"
@@ -39,11 +39,11 @@ type Server struct {
StopChan chan os.Signal
Options *config.Options
- CertStorage cert.Storage
+ CertStorage cert2.Storage
KubeClient k8s.Client
- CertificateServer *v1alpha1.DubboCertificateServiceServerImpl
+ CertificateServer *v1alpha12.DubboCertificateServiceServerImpl
PlainServer *grpc.Server
SecureServer *grpc.Server
@@ -69,7 +69,7 @@ func (s *Server) Init() {
}
if s.CertStorage == nil {
- s.CertStorage = cert.NewStorage(s.Options)
+ s.CertStorage = cert2.NewStorage(s.Options)
}
go s.CertStorage.RefreshServerCert()
@@ -78,14 +78,14 @@ func (s *Server) Init() {
s.LoadRootCert()
s.LoadAuthorityCert()
- impl := &v1alpha1.DubboCertificateServiceServerImpl{
+ impl := &v1alpha12.DubboCertificateServiceServerImpl{
Options: s.Options,
CertStorage: s.CertStorage,
KubeClient: s.KubeClient,
}
s.PlainServer = grpc.NewServer()
- v1alpha1.RegisterDubboCertificateServiceServer(s.PlainServer, impl)
+ v1alpha12.RegisterDubboCertificateServiceServer(s.PlainServer, impl)
reflection.Register(s.PlainServer)
tlsConfig := &tls.Config{
@@ -99,7 +99,7 @@ func (s *Server) Init() {
s.CertStorage.GetServerCert("dubbo-ca." + s.Options.Namespace + ".svc.cluster.local")
s.SecureServer = grpc.NewServer(grpc.Creds(credentials.NewTLS(tlsConfig)))
- v1alpha1.RegisterDubboCertificateServiceServer(s.SecureServer, impl)
+ v1alpha12.RegisterDubboCertificateServiceServer(s.SecureServer, impl)
reflection.Register(s.SecureServer)
if s.Options.InPodEnv {
@@ -122,9 +122,9 @@ func (s *Server) LoadAuthorityCert() {
if s.Options.IsKubernetesConnected {
certStr, priStr := s.KubeClient.GetAuthorityCert(s.Options.Namespace)
if certStr != "" && priStr != "" {
- s.CertStorage.GetAuthorityCert().Cert = cert.DecodeCert(certStr)
+ s.CertStorage.GetAuthorityCert().Cert = cert2.DecodeCert(certStr)
s.CertStorage.GetAuthorityCert().CertPem = certStr
- s.CertStorage.GetAuthorityCert().PrivateKey = cert.DecodePrivateKey(priStr)
+ s.CertStorage.GetAuthorityCert().PrivateKey = cert2.DecodePrivateKey(priStr)
}
}
@@ -140,10 +140,10 @@ func (s *Server) ScheduleRefreshAuthorityCert() {
logger.Sugar.Infof("Authority cert is invalid, refresh it.")
// TODO lock if multi server
// TODO refresh signed cert
- s.CertStorage.SetAuthorityCert(cert.GenerateAuthorityCert(s.CertStorage.GetRootCert(), s.Options.CaValidity))
+ s.CertStorage.SetAuthorityCert(cert2.GenerateAuthorityCert(s.CertStorage.GetRootCert(), s.Options.CaValidity))
if s.Options.IsKubernetesConnected {
- s.KubeClient.UpdateAuthorityCert(s.CertStorage.GetAuthorityCert().CertPem, cert.EncodePrivateKey(s.CertStorage.GetAuthorityCert().PrivateKey), s.Options.Namespace)
+ s.KubeClient.UpdateAuthorityCert(s.CertStorage.GetAuthorityCert().CertPem, cert2.EncodePrivateKey(s.CertStorage.GetAuthorityCert().PrivateKey), s.Options.Namespace)
s.KubeClient.UpdateWebhookConfig(s.Options, s.CertStorage)
if s.KubeClient.UpdateAuthorityPublicKey(s.CertStorage.GetAuthorityCert().CertPem) {
logger.Sugar.Infof("Write ca to config maps success.")
@@ -167,11 +167,11 @@ func (s *Server) RefreshAuthorityCert() {
logger.Sugar.Infof("Load authority cert from kubernetes secrect success.")
} else {
logger.Sugar.Warnf("Load authority cert from kubernetes secrect failed.")
- s.CertStorage.SetAuthorityCert(cert.GenerateAuthorityCert(s.CertStorage.GetRootCert(), s.Options.CaValidity))
+ s.CertStorage.SetAuthorityCert(cert2.GenerateAuthorityCert(s.CertStorage.GetRootCert(), s.Options.CaValidity))
// TODO lock if multi server
if s.Options.IsKubernetesConnected {
- s.KubeClient.UpdateAuthorityCert(s.CertStorage.GetAuthorityCert().CertPem, cert.EncodePrivateKey(s.CertStorage.GetAuthorityCert().PrivateKey), s.Options.Namespace)
+ s.KubeClient.UpdateAuthorityCert(s.CertStorage.GetAuthorityCert().CertPem, cert2.EncodePrivateKey(s.CertStorage.GetAuthorityCert().PrivateKey), s.Options.Namespace)
}
}
diff --git a/ca/pkg/security/server_test.go b/pkg/authority/security/server_test.go
similarity index 83%
rename from ca/pkg/security/server_test.go
rename to pkg/authority/security/server_test.go
index 071a0f9..097be41 100644
--- a/ca/pkg/security/server_test.go
+++ b/pkg/authority/security/server_test.go
@@ -17,10 +17,10 @@ package security
import (
"crypto/tls"
- "github.com/apache/dubbo-admin/ca/pkg/cert"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/k8s"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
+ cert2 "github.com/apache/dubbo-admin/pkg/authority/cert"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/k8s"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
"os"
"testing"
"time"
@@ -50,8 +50,8 @@ func (s *mockKubeClient) UpdateAuthorityPublicKey(cert string) bool {
}
type mockStorage struct {
- cert.Storage
- origin cert.Storage
+ cert2.Storage
+ origin cert2.Storage
}
func (s *mockStorage) GetServerCert(serverName string) *tls.Certificate {
@@ -62,27 +62,27 @@ func (s *mockStorage) RefreshServerCert() {
}
-func (s *mockStorage) SetAuthorityCert(cert *cert.Cert) {
+func (s *mockStorage) SetAuthorityCert(cert *cert2.Cert) {
s.origin.SetAuthorityCert(cert)
}
-func (s *mockStorage) GetAuthorityCert() *cert.Cert {
+func (s *mockStorage) GetAuthorityCert() *cert2.Cert {
return s.origin.GetAuthorityCert()
}
-func (s *mockStorage) SetRootCert(cert *cert.Cert) {
+func (s *mockStorage) SetRootCert(cert *cert2.Cert) {
s.origin.SetRootCert(cert)
}
-func (s *mockStorage) GetRootCert() *cert.Cert {
+func (s *mockStorage) GetRootCert() *cert2.Cert {
return s.origin.GetRootCert()
}
-func (s *mockStorage) AddTrustedCert(cert *cert.Cert) {
+func (s *mockStorage) AddTrustedCert(cert *cert2.Cert) {
s.origin.AddTrustedCert(cert)
}
-func (s *mockStorage) GetTrustedCerts() []*cert.Cert {
+func (s *mockStorage) GetTrustedCerts() []*cert2.Cert {
return s.origin.GetTrustedCerts()
}
@@ -113,7 +113,7 @@ func TestInit(t *testing.T) {
}
certPEM = s.CertStorage.GetAuthorityCert().CertPem
- priPEM = cert.EncodePrivateKey(s.CertStorage.GetAuthorityCert().PrivateKey)
+ priPEM = cert2.EncodePrivateKey(s.CertStorage.GetAuthorityCert().PrivateKey)
s.PlainServer.Stop()
s.SecureServer.Stop()
@@ -155,7 +155,7 @@ func TestRefresh(t *testing.T) {
s.KubeClient = &mockKubeClient{}
storage := &mockStorage{}
- storage.origin = cert.NewStorage(options)
+ storage.origin = cert2.NewStorage(options)
s.CertStorage = storage
s.Init()
diff --git a/ca/pkg/v1alpha1/ca.pb.go b/pkg/authority/v1alpha1/ca.pb.go
similarity index 100%
rename from ca/pkg/v1alpha1/ca.pb.go
rename to pkg/authority/v1alpha1/ca.pb.go
diff --git a/ca/pkg/v1alpha1/ca.proto b/pkg/authority/v1alpha1/ca.proto
similarity index 100%
rename from ca/pkg/v1alpha1/ca.proto
rename to pkg/authority/v1alpha1/ca.proto
diff --git a/ca/pkg/v1alpha1/ca_grpc.pb.go b/pkg/authority/v1alpha1/ca_grpc.pb.go
similarity index 100%
rename from ca/pkg/v1alpha1/ca_grpc.pb.go
rename to pkg/authority/v1alpha1/ca_grpc.pb.go
diff --git a/ca/pkg/v1alpha1/ca_impl.go b/pkg/authority/v1alpha1/ca_impl.go
similarity index 90%
rename from ca/pkg/v1alpha1/ca_impl.go
rename to pkg/authority/v1alpha1/ca_impl.go
index f362185..1632c0c 100644
--- a/ca/pkg/v1alpha1/ca_impl.go
+++ b/pkg/authority/v1alpha1/ca_impl.go
@@ -17,10 +17,10 @@ package v1alpha1
import (
"context"
- "github.com/apache/dubbo-admin/ca/pkg/cert"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/k8s"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
+ cert2 "github.com/apache/dubbo-admin/pkg/authority/cert"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/k8s"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer"
"strings"
@@ -30,7 +30,7 @@ import (
type DubboCertificateServiceServerImpl struct {
UnimplementedDubboCertificateServiceServer
Options *config.Options
- CertStorage cert.Storage
+ CertStorage cert2.Storage
KubeClient k8s.Client
}
@@ -42,7 +42,7 @@ func (s *DubboCertificateServiceServerImpl) CreateCertificate(c context.Context,
}, nil
}
- csr, err := cert.LoadCSR(req.Csr)
+ csr, err := cert2.LoadCSR(req.Csr)
if csr == nil || err != nil {
return &DubboCertificateResponse{
Success: false,
@@ -91,7 +91,7 @@ func (s *DubboCertificateServiceServerImpl) CreateCertificate(c context.Context,
}
// TODO check server token
- certPem, err := cert.SignFromCSR(csr, s.CertStorage.GetAuthorityCert(), s.Options.CertValidity)
+ certPem, err := cert2.SignFromCSR(csr, s.CertStorage.GetAuthorityCert(), s.Options.CertValidity)
if err != nil {
logger.Sugar.Warnf("Failed to sign certificate from csr: %v. RemoteAddr: %s", err, p.Addr.String())
return &DubboCertificateResponse{
diff --git a/ca/pkg/v1alpha1/ca_impl_test.go b/pkg/authority/v1alpha1/ca_impl_test.go
similarity index 86%
rename from ca/pkg/v1alpha1/ca_impl_test.go
rename to pkg/authority/v1alpha1/ca_impl_test.go
index 159d89b..59871d6 100644
--- a/ca/pkg/v1alpha1/ca_impl_test.go
+++ b/pkg/authority/v1alpha1/ca_impl_test.go
@@ -16,10 +16,10 @@
package v1alpha1
import (
- "github.com/apache/dubbo-admin/ca/pkg/cert"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/k8s"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
+ cert2 "github.com/apache/dubbo-admin/pkg/authority/cert"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/k8s"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
"golang.org/x/net/context"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/peer"
@@ -56,8 +56,8 @@ func TestCSRFailed(t *testing.T) {
CertValidity: 24 * 60 * 60 * 1000,
CaValidity: 365 * 24 * 60 * 60 * 1000,
}
- storage := cert.NewStorage(options)
- storage.SetAuthorityCert(cert.GenerateAuthorityCert(nil, options.CaValidity))
+ storage := cert2.NewStorage(options)
+ storage.SetAuthorityCert(cert2.GenerateAuthorityCert(nil, options.CaValidity))
kubeClient := &MockKubeClient{}
impl := &DubboCertificateServiceServerImpl{
@@ -122,8 +122,8 @@ func TestTokenFailed(t *testing.T) {
CertValidity: 24 * 60 * 60 * 1000,
CaValidity: 365 * 24 * 60 * 60 * 1000,
}
- storage := cert.NewStorage(options)
- storage.SetAuthorityCert(cert.GenerateAuthorityCert(nil, options.CaValidity))
+ storage := cert2.NewStorage(options)
+ storage.SetAuthorityCert(cert2.GenerateAuthorityCert(nil, options.CaValidity))
kubeClient := &MockKubeClient{}
impl := &DubboCertificateServiceServerImpl{
@@ -132,7 +132,7 @@ func TestTokenFailed(t *testing.T) {
KubeClient: kubeClient,
}
- csr, privateKey, err := cert.GenerateCSR()
+ csr, privateKey, err := cert2.GenerateCSR()
if err != nil {
t.Fatal(err)
return
@@ -206,8 +206,8 @@ func TestTokenFailed(t *testing.T) {
return
}
- generatedCert := cert.DecodeCert(certificate.CertPem)
- c2 := &cert.Cert{
+ generatedCert := cert2.DecodeCert(certificate.CertPem)
+ c2 := &cert2.Cert{
Cert: generatedCert,
CertPem: certificate.CertPem,
PrivateKey: privateKey,
@@ -233,8 +233,8 @@ func TestSuccess(t *testing.T) {
CertValidity: 24 * 60 * 60 * 1000,
CaValidity: 365 * 24 * 60 * 60 * 1000,
}
- storage := cert.NewStorage(options)
- storage.SetAuthorityCert(cert.GenerateAuthorityCert(nil, options.CaValidity))
+ storage := cert2.NewStorage(options)
+ storage.SetAuthorityCert(cert2.GenerateAuthorityCert(nil, options.CaValidity))
kubeClient := &MockKubeClient{}
impl := &DubboCertificateServiceServerImpl{
@@ -243,7 +243,7 @@ func TestSuccess(t *testing.T) {
KubeClient: kubeClient,
}
- csr, privateKey, err := cert.GenerateCSR()
+ csr, privateKey, err := cert2.GenerateCSR()
if err != nil {
t.Fatal(err)
return
@@ -263,8 +263,8 @@ func TestSuccess(t *testing.T) {
return
}
- generatedCert := cert.DecodeCert(certificate.CertPem)
- c2 := &cert.Cert{
+ generatedCert := cert2.DecodeCert(certificate.CertPem)
+ c2 := &cert2.Cert{
Cert: generatedCert,
CertPem: certificate.CertPem,
PrivateKey: privateKey,
diff --git a/ca/pkg/webhook/server.go b/pkg/authority/webhook/server.go
similarity index 98%
rename from ca/pkg/webhook/server.go
rename to pkg/authority/webhook/server.go
index 73fe64f..3b8a368 100644
--- a/ca/pkg/webhook/server.go
+++ b/pkg/authority/webhook/server.go
@@ -19,8 +19,8 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
- "github.com/apache/dubbo-admin/ca/pkg/config"
- "github.com/apache/dubbo-admin/ca/pkg/logger"
+ "github.com/apache/dubbo-admin/pkg/authority/config"
+ "github.com/apache/dubbo-admin/pkg/authority/logger"
"github.com/mattbaird/jsonpatch"
"io"
admissionV1 "k8s.io/api/admission/v1"