Merge branch 'apache:master' into master

Author: Helltab

dubboctl/cmd/create.go

@@ -33,8 +33,9 @@ import (
 type createArgs struct {
 	// dirname specifies the name of the custom-created directory.
 	dirname string
-	// language specifies different SDK languages.
+	// language specifies different sdk languages.
 	language string
+	// template specifies repository or default common.
 	template string
 }
 
@@ -102,12 +103,16 @@ func sdkGenerateCmd(cmd *cobra.Command, clientFactory ClientFactory) *cobra.Comm
 
 type createConfig struct {
 	// Path Absolute to function source
-	Path     string
-	Runtime  string
+	Path string
+	// Runtime
+	Runtime string
+	// Template
 	Template string
-	// Repo URI (overrides builtin and installed)
-	Repo        string
-	DirName     string
+	// Repo Uri (overrides builtin and installed)
+	Repo string
+	// DirName Defines a custom creation directory name。
+	DirName string
+	// Initialized
 	Initialized bool
 }
 

dubboctl/cmd/image.go

@@ -35,10 +35,14 @@ import (
 )
 
 type imageArgs struct {
+	// dockerfile Defines the required Dockerfile files.
 	dockerfile bool
-	builder    bool
-	output     string
-	destroy    bool
+	// builder Defines the path used by the builder.
+	builder bool
+	// output Defines the generated dubbo deploy yaml file.
+	output string
+	// destroy Defines the deletion of deploy yaml file.
+	destroy bool
 }
 
 func addHubFlags(cmd *cobra.Command, iArgs *imageArgs) {
@@ -48,7 +52,7 @@ func addHubFlags(cmd *cobra.Command, iArgs *imageArgs) {
 
 func addDeployFlags(cmd *cobra.Command, iArgs *imageArgs) {
 	cmd.PersistentFlags().StringVarP(&iArgs.output, "output", "o", "dubbo-deploy.yaml", "The output generates k8s yaml file")
-	cmd.PersistentFlags().BoolVarP(&iArgs.destroy, "delete", "d", false, "delete k8s yaml file")
+	cmd.PersistentFlags().BoolVarP(&iArgs.destroy, "delete", "d", false, "deletion k8s yaml file")
 }
 
 func ImageCmd(ctx cli.Context, cmd *cobra.Command, clientFactory ClientFactory) *cobra.Command {
@@ -64,9 +68,12 @@ func ImageCmd(ctx cli.Context, cmd *cobra.Command, clientFactory ClientFactory)
 }
 
 type hubConfig struct {
+	// Dockerfile Defines the required files.
 	Dockerfile bool
-	Builder    bool
-	Image      string
+	// Builder Defines the path used by the builder.
+	Builder bool
+	// Image information required by image.
+	Image string
 	// BuilderImage is the image (name or mapping) to use for building.  Usually
 	// set automatically.
 	BuilderImage string

dubboctl/cmd/root.go

@@ -48,7 +48,7 @@ func NewClientFactory(options ...sdk.Option) (*sdk.Client, func()) {
 	var (
 		t = newTransport(false)
 		c = newCredentialsProvider(util.Dir(), t)
-		d = newDubboDeployer()
+		d = newDeployer()
 		o = []sdk.Option{
 			sdk.WithRepositoriesPath(util.RepositoriesPath()),
 			sdk.WithBuilder(pack.NewBuilder()),
@@ -77,7 +77,7 @@ func newCredentialsProvider(configPath string, t http.RoundTripper) pusher.Crede
 	return credentials.NewCredentialsProvider(configPath, options...)
 }
 
-func newDubboDeployer() sdk.Deployer {
+func newDeployer() sdk.Deployer {
 	var options []deployer.DeployerOption
 
 	return deployer.NewDeployer(options...)

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
 	})
 

dubboctl/pkg/hub/builder/pack/build.go

@@ -52,7 +52,7 @@ var (
 
 type Builder struct {
 	name          string
-	outBuff       bytes.Buffer
+	outBuffer     bytes.Buffer
 	logger        logging.Logger
 	impl          Impl
 	withTimestamp bool
@@ -136,7 +136,7 @@ func (b *Builder) Build(ctx context.Context, dc *dubbo.DubboConfig) (err error)
 		} else {
 			err = fmt.Errorf("failed to build the application: %w", err)
 			fmt.Fprintln(color.Stderr(), "")
-			_, _ = io.Copy(color.Stderr(), &b.outBuff)
+			_, _ = io.Copy(color.Stderr(), &b.outBuffer)
 			fmt.Fprintln(color.Stderr(), "")
 		}
 	}

dubboctl/pkg/hub/deployer/deploy.tpl

@@ -21,16 +21,6 @@ spec:
         ports:
         - containerPort: {{.Port}}
           name: dubbo
-        readinessProbe:
-          tcpSocket:
-            port: {{.Port}}
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        livenessProbe:
-          tcpSocket:
-            port: {{.Port}}
-          initialDelaySeconds: 15
-          periodSeconds: 20
         resources:
           requests:
             cpu: 100m

dubboctl/pkg/hub/pusher/pusher.go

@@ -51,29 +51,24 @@ type Credentials struct {
 
 type CredentialsProvider func(ctx context.Context, image string) (Credentials, error)
 
-type PusherDockerClientFactory func() (PusherDockerClient, error)
+type DockerClientFactory func() (DockerClient, error)
 
 type Pusher struct {
 	credentialsProvider CredentialsProvider
 	transport           http.RoundTripper
-	dockerClientFactory PusherDockerClientFactory
+	dockerClientFactory DockerClientFactory
 }
 
 type authConfig struct {
-	Username      string `json:"username,omitempty"`
-	Password      string `json:"password,omitempty"`
-	Auth          string `json:"auth,omitempty"`
-	Email         string `json:"email,omitempty"`
-	ServerAddress string `json:"serveraddress,omitempty"`
-	IdentityToken string `json:"identitytoken,omitempty"`
-	RegistryToken string `json:"registrytoken,omitempty"`
+	Username string `json:"username,omitempty"`
+	Password string `json:"password,omitempty"`
 }
 
 func NewPusher(opts ...Opt) *Pusher {
 	result := &Pusher{
 		credentialsProvider: EmptyCredentialsProvider,
 		transport:           http.DefaultTransport,
-		dockerClientFactory: func() (PusherDockerClient, error) {
+		dockerClientFactory: func() (DockerClient, error) {
 			c, _, err := hub.NewClient(client.DefaultDockerHost)
 			return c, err
 		},
@@ -236,7 +231,7 @@ func (n *Pusher) push(ctx context.Context, dc *dubbo.DubboConfig, credentials Cr
 	return hash.String(), nil
 }
 
-type PusherDockerClient interface {
+type DockerClient interface {
 	daemon.Client
 	ImagePush(ctx context.Context, ref string, options types.ImagePushOptions) (io.ReadCloser, error)
 	Close() error

manifests/addons/gen.sh

@@ -24,58 +24,16 @@ set -eux
 # script set up the plain text rendered
 
 KUBERNETES=${WORKDIR}/../kubernetes
-DASHBOARDS=${WORKDIR}
 mkdir -p "${KUBERNETES}"
-kubectl delete ns dubbo-system && kubectl create ns dubbo-system
-
-
-# Set up zookeeper
-helm template zookeeper zookeeper \
-  --namespace dubbo-system \
-  --version 11.1.6 \
-  --repo https://charts.bitnami.com/bitnami  \
-  -f "${WORKDIR}/values-zookeeper.yaml" \
-  > "${KUBERNETES}/zookeeper.yaml"
-
+kubectl create ns dubbo-system
+if [ $? -ne 0 ];then
+  kubectl delete ns dubbo-system ; kubectl create ns dubbo-system
+fi
 
 # Set up prometheus
 helm template prometheus prometheus \
   --namespace dubbo-system \
-  --version 20.0.2 \
+  --version 27.5.1 \
   --repo https://prometheus-community.github.io/helm-charts \
-  -f "${WORKDIR}/values-prometheus.yaml" \
-  > "${KUBERNETES}/prometheus.yaml"
-
-
-# Set up grafana
-{
-  helm template grafana grafana \
-    --namespace dubbo-system \
-    --version 6.52.4 \
-    --repo https://grafana.github.io/helm-charts \
-    -f "${WORKDIR}/values-grafana.yaml" \
-
-  echo -e "\n---\n"
-
-  kubectl create configmap -n dubbo-system admin-extra-dashboards \
-    --dry-run=client -oyaml \
-    --from-file=extra-dashboard.json="${DASHBOARDS}/dashboards/external-dashboard.json"
-} > "${KUBERNETES}/grafana.yaml"
-
-
-# Set up skywalking
-helm template skywalking skywalking \
-  --namespace dubbo-system \
-  --version 4.3.0 \
-  --repo https://apache.jfrog.io/artifactory/skywalking-helm \
-  -f "${WORKDIR}/values-skywalking.yaml" \
-  > "${KUBERNETES}/skywalking.yaml"
-
-
-# Set up zipkin
-helm template zipkin zipkin \
-  --namespace dubbo-system \
-  --version 0.1.2 \
-  --repo https://zipkin.io/zipkin-helm \
-  -f "${WORKDIR}/values-zipkin.yaml" \
-  > "${KUBERNETES}/zipkin.yaml"
+  -f "${WD}/values-prometheus.yaml" \
+  > "${ADDONS}/prometheus.yaml"

manifests/addons/values-grafana.yaml

@@ -15,16 +15,32 @@
 
 alertmanager:
   enabled: false
+
 prometheus-pushgateway:
   enabled: false
+
 kube-state-metrics:
   enabled: false
+
 prometheus-node-exporter:
   enabled: false
+
 server:
   persistentVolume:
     enabled: false
   service:
     servicePort: 9090
+  readinessProbeInitialDelay: 0
+
   global:
     scrape_interval: 15s
+
+  image:
+    repository: prom/prometheus
+
+  securityContext: null
+
+configmapReload:
+  prometheus:
+    image:
+      repository: ghcr.io/prometheus-operator/prometheus-config-reloader