This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new ac86a9c2 [chore] update charts and operator (#674)
ac86a9c2 is described below
commit ac86a9c247926a7bf04997a3f79424a273cfbdda
Author: Jian Zhong <[email protected]>
AuthorDate: Tue Apr 8 16:24:19 2025 +0800
[chore] update charts and operator (#674)
---
dubboctl/pkg/cli/context.go | 4 +-
manifests/charts/admin/templates/NOTES.txt | 1 -
.../zookeeper/templates/statefulset.yaml | 43 ++++++----------------
operator/cmd/cluster/manifest.go | 4 +-
operator/cmd/cluster/uninstall.go | 14 +++----
5 files changed, 21 insertions(+), 45 deletions(-)
diff --git a/dubboctl/pkg/cli/context.go b/dubboctl/pkg/cli/context.go
index 76b7d36e..49ef0c33 100644
--- a/dubboctl/pkg/cli/context.go
+++ b/dubboctl/pkg/cli/context.go
@@ -71,8 +71,8 @@ func (i *instance) CLIClientWithRevision(rev string)
(kube.CLIClient, error) {
func newKubeClientWithRevision(kubeconfig, context, revision string,
impersonationConfig rest.ImpersonationConfig) (kube.CLIClient, error) {
drc, err := kube.DefaultRestConfig(kubeconfig, context, func(config
*rest.Config) {
- config.QPS = 55
- config.Burst = 95
+ config.QPS = 50
+ config.Burst = 100
config.Impersonate = impersonationConfig
})
diff --git a/manifests/charts/admin/templates/NOTES.txt
b/manifests/charts/admin/templates/NOTES.txt
deleted file mode 100644
index b5ff8dc3..00000000
--- a/manifests/charts/admin/templates/NOTES.txt
+++ /dev/null
@@ -1 +0,0 @@
-🌹 For more details, please visit https://dubbo.apache.org.
diff --git
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
index 4c163eba..3a8d902f 100644
---
a/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
+++
b/manifests/charts/dubbo-control/register-discovery/zookeeper/templates/statefulset.yaml
@@ -37,46 +37,25 @@ spec:
image: zookeeper
imagePullPolicy: {{ $zookeeper.imagePullPolicy }}
env:
- - name: DATA_LOG_DIR
- value: ''
+ # The number of milliseconds of each tick
- name: TICK_TIME
value: "2000"
+ # The number of ticks that the initial
+ # synchronization phase can take
- name: INIT_LIMIT
value: "10"
+ # The number of ticks that can pass between
+ # sending a request and getting an acknowledgement
- name: SYNC_LIMIT
value: "5"
+ # the directory where the snapshot is stored.
+ # do not use /tmp for storage, /tmp here is just
+ # example sakes.
+ - name: DATA_LOG_DIR
+ value: ''
+ # the port at which the clients will connect
- name: PORT_NUMBER
value: "2181"
- - name: PRE_ALLOC_SIZE
- value: "65536"
- - name: SNAPCOUNT
- value: "100000"
- - name: MAX_CLIENT_CNXNS
- value: "60"
- - name: 4LW_COMMANDS_WHITELIST
- value: "srvr, mntr, ruok"
- - name: LISTEN_ALLIPS_ENABLED
- value: "no"
- - name: AUTOPURGE_INTERVAL
- value: "1"
- - name: AUTOPURGE_RETAIN_COUNT
- value: "10"
- - name: MAX_SESSION_TIMEOUT
- value: "40000"
- - name: ENABLE_AUTH
- value: "no"
- - name: ENABLE_QUORUM_AUTH
- value: "no"
- - name: HEAP_SIZE
- value: "1024"
- - name: LOG_LEVEL
- value: "ERROR"
- - name: ALLOW_ANONYMOUS_LOGIN
- value: "yes"
- - name: ADMIN_SERVER_PORT_NUMBER
- value: "8080"
- - name: SERVERS
- value: "zookeeper-0.zookeeper-headless:2888:3888::1"
resources:
{{ toYaml $zookeeper.resources | trim | indent 10 }}
ports:
diff --git a/operator/cmd/cluster/manifest.go b/operator/cmd/cluster/manifest.go
index 073c29ec..6955fe31 100644
--- a/operator/cmd/cluster/manifest.go
+++ b/operator/cmd/cluster/manifest.go
@@ -46,8 +46,8 @@ func (a *manifestGenerateArgs) String() string {
}
func addManifestGenerateFlags(cmd *cobra.Command, args *manifestGenerateArgs) {
- cmd.PersistentFlags().StringSliceVarP(&args.filenames, "filenames",
"f", nil, ``)
- cmd.PersistentFlags().StringArrayVarP(&args.sets, "set", "s", nil, ``)
+ // cmd.PersistentFlags().StringSliceVarP(&args.filenames, "filenames",
"f", nil, ``)
+ cmd.PersistentFlags().StringArrayVarP(&args.sets, "set", "s", nil,
`Override dubboOperator values, such as selecting profiles, etc.`)
}
func ManifestCmd(ctx cli.Context) *cobra.Command {
diff --git a/operator/cmd/cluster/uninstall.go
b/operator/cmd/cluster/uninstall.go
index 570fc017..24002566 100644
--- a/operator/cmd/cluster/uninstall.go
+++ b/operator/cmd/cluster/uninstall.go
@@ -31,7 +31,8 @@ import (
type uninstallArgs struct {
// filenames is an array of paths to input DubboOperator CR files.
- filenames string
+ // TODO
+ // filenames string
// sets is a string with the format "path=value".
sets []string
// manifestPath is a path to a charts and profiles directory in the
local filesystem with a release tgz.
@@ -44,7 +45,7 @@ type uninstallArgs struct {
}
func addUninstallFlags(cmd *cobra.Command, args *uninstallArgs) {
- cmd.PersistentFlags().StringVarP(&args.filenames, "filenames", "f", "",
"The filename of the DubboOperator CR.")
+ // cmd.PersistentFlags().StringVarP(&args.filenames, "filenames", "f",
"", "The filename of the DubboOperator CR.")
cmd.PersistentFlags().StringArrayVarP(&args.sets, "set", "s", nil,
`Override dubboOperator values, such as selecting profiles, etc.`)
cmd.PersistentFlags().BoolVar(&args.remove, "remove", false, `Remove
all dubbo related source code.`)
cmd.PersistentFlags().BoolVarP(&args.skipConfirmation,
"skip-confirmation", "y", false, `The skipConfirmation determines whether the
user is prompted for confirmation.`)
@@ -64,8 +65,8 @@ func UninstallCmd(ctx cli.Context) *cobra.Command {
# Uninstall all control planes and shared resources
dubboctl uninstall --remove`,
Args: func(cmd *cobra.Command, args []string) error {
- if uiArgs.filenames == "" && !uiArgs.remove {
- return fmt.Errorf("at least one of the
--filename or --remove flags must be set")
+ if !uiArgs.remove {
+ return fmt.Errorf("at least one of the --remove
flags must be set")
}
if len(args) > 0 {
return fmt.Errorf("dubboctl uninstall does not
take arguments")
@@ -92,16 +93,13 @@ func Uninstall(cmd *cobra.Command, ctx cli.Context,
rootArgs *RootArgs, uiArgs *
}
pl := progress.NewLog()
- if uiArgs.remove && uiArgs.filenames != "" {
+ if uiArgs.remove {
cl.LogAndPrint("Purge uninstall will remove all Dubbo
resources, ignoring the specified revision or operator file")
}
setFlags := applyFlagAliases(uiArgs.sets)
files := []string{}
- if uiArgs.filenames != "" {
- files = append(files, uiArgs.filenames)
- }
vals, err := render.MergeInputs(files, setFlags)
if err != nil {
