From b74d5011da6fb09596bda4d545889d7f9274b770 Mon Sep 17 00:00:00 2001 From: Kunshuai Zhu Date: Fri, 29 Apr 2022 16:57:53 +0800 Subject: [PATCH] Feat: vela-core helm chart supports configure multicluster metrics (#3788) * vela-core helm charts support config multicluster metrics Signed-off-by: zhukunshuai * update comment Signed-off-by: zhukunshuai * update readme Signed-off-by: zhukunshuai --- charts/vela-core/README.md | 25 ++++++++++--------- .../templates/kubevela-controller.yaml | 3 +++ charts/vela-core/values.yaml | 3 +++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/charts/vela-core/README.md b/charts/vela-core/README.md index f71533f89..819c9aa6c 100644 --- a/charts/vela-core/README.md +++ b/charts/vela-core/README.md @@ -96,18 +96,19 @@ helm install --create-namespace -n vela-system kubevela kubevela/vela-core --wai ### MultiCluster parameters -| Name | Description | Value | -| ----------------------------------------------------- | -------------------------------- | -------------------------------- | -| `multicluster.enabled` | Whether to enable multi-cluster | `true` | -| `multicluster.clusterGateway.replicaCount` | ClusterGateway replica count | `1` | -| `multicluster.clusterGateway.port` | ClusterGateway port | `9443` | -| `multicluster.clusterGateway.image.repository` | ClusterGateway image repository | `oamdev/cluster-gateway` | -| `multicluster.clusterGateway.image.tag` | ClusterGateway image tag | `v1.3.2` | -| `multicluster.clusterGateway.image.pullPolicy` | ClusterGateway image pull policy | `IfNotPresent` | -| `multicluster.clusterGateway.resources.limits.cpu` | ClusterGateway cpu limit | `100m` | -| `multicluster.clusterGateway.resources.limits.memory` | ClusterGateway memory limit | `200Mi` | -| `multicluster.clusterGateway.secureTLS.enabled` | Whether to enable secure TLS | `true` | -| `multicluster.clusterGateway.secureTLS.certPath` | Path to the certificate file | `/etc/k8s-cluster-gateway-certs` | +| Name | Description | Value | +| ----------------------------------------------------- | ----------------------------------------------- | -------------------------------- | +| `multicluster.enabled` | Whether to enable multi-cluster | `true` | +| `multicluster.metrics.enabled` | Whether to enable multi-cluster metrics collect | `false` | +| `multicluster.clusterGateway.replicaCount` | ClusterGateway replica count | `1` | +| `multicluster.clusterGateway.port` | ClusterGateway port | `9443` | +| `multicluster.clusterGateway.image.repository` | ClusterGateway image repository | `oamdev/cluster-gateway` | +| `multicluster.clusterGateway.image.tag` | ClusterGateway image tag | `v1.3.2` | +| `multicluster.clusterGateway.image.pullPolicy` | ClusterGateway image pull policy | `IfNotPresent` | +| `multicluster.clusterGateway.resources.limits.cpu` | ClusterGateway cpu limit | `100m` | +| `multicluster.clusterGateway.resources.limits.memory` | ClusterGateway memory limit | `200Mi` | +| `multicluster.clusterGateway.secureTLS.enabled` | Whether to enable secure TLS | `true` | +| `multicluster.clusterGateway.secureTLS.certPath` | Path to the certificate file | `/etc/k8s-cluster-gateway-certs` | ### Test parameters diff --git a/charts/vela-core/templates/kubevela-controller.yaml b/charts/vela-core/templates/kubevela-controller.yaml index e433cb8fd..ce81b03ec 100644 --- a/charts/vela-core/templates/kubevela-controller.yaml +++ b/charts/vela-core/templates/kubevela-controller.yaml @@ -165,6 +165,9 @@ spec: {{ if .Values.multicluster.enabled }} - "--enable-cluster-gateway" {{ end }} + {{ if .Values.multicluster.metrics.enabled }} + - "--enable-cluster-metrics" + {{ end }} - "--application-re-sync-period={{ .Values.controllerArgs.reSyncPeriod }}" - "--concurrent-reconciles={{ .Values.concurrentReconciles }}" - "--kube-api-qps={{ .Values.kubeClient.qps }}" diff --git a/charts/vela-core/values.yaml b/charts/vela-core/values.yaml index 7d036bc0e..ba9ab4e6f 100644 --- a/charts/vela-core/values.yaml +++ b/charts/vela-core/values.yaml @@ -110,6 +110,7 @@ optimize: ## @section MultiCluster parameters ## @param multicluster.enabled Whether to enable multi-cluster +## @param multicluster.metrics.enabled Whether to enable multi-cluster metrics collect ## @param multicluster.clusterGateway.replicaCount ClusterGateway replica count ## @param multicluster.clusterGateway.port ClusterGateway port ## @param multicluster.clusterGateway.image.repository ClusterGateway image repository @@ -121,6 +122,8 @@ optimize: ## @param multicluster.clusterGateway.secureTLS.certPath Path to the certificate file multicluster: enabled: true + metrics: + enabled: false clusterGateway: replicaCount: 1 port: 9443