From b108801b60af050ef5ff84a4ef21a39446301fae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Feb 2022 19:14:38 +0800 Subject: [PATCH] Chore: remove useless controller args to avoid confusion (#3286) Signed-off-by: Jianbo Sun (cherry picked from commit 12832fed5c2e4881e085bb3de77b65ac124e3bde) Co-authored-by: Jianbo Sun --- charts/vela-core/templates/kubevela-controller.yaml | 2 -- charts/vela-core/values.yaml | 4 ---- cmd/core/main.go | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/charts/vela-core/templates/kubevela-controller.yaml b/charts/vela-core/templates/kubevela-controller.yaml index 31c8ff668..d1f253854 100644 --- a/charts/vela-core/templates/kubevela-controller.yaml +++ b/charts/vela-core/templates/kubevela-controller.yaml @@ -120,10 +120,8 @@ spec: - "--use-webhook=true" - "--webhook-port={{ .Values.webhookService.port }}" - "--webhook-cert-dir={{ .Values.admissionWebhooks.certificate.mountPath }}" - - "--autogen-workload-definition={{ .Values.admissionWebhooks.autoGenWorkloadDefinition }}" {{ end }} - "--health-addr=:{{ .Values.healthCheck.port }}" - - "--apply-once-only={{ .Values.applyOnceOnly }}" {{ if ne .Values.disableCaps "" }} - "--disable-caps={{ .Values.disableCaps }}" {{ end }} diff --git a/charts/vela-core/values.yaml b/charts/vela-core/values.yaml index e6d68893b..5d22ffee8 100644 --- a/charts/vela-core/values.yaml +++ b/charts/vela-core/values.yaml @@ -3,8 +3,6 @@ # Declare variables to be passed into your templates. replicaCount: 1 -# Valid applyOnceOnly values: true/false/on/off/force -applyOnceOnly: "off" disableCaps: "" @@ -81,8 +79,6 @@ admissionWebhooks: certManager: enabled: false revisionHistoryLimit: 3 - # If autoGenWorkloadDefinition is true, webhook will auto generated workloadDefinition which componentDefinition refers to - autoGenWorkloadDefinition: true #Enable debug logs for development purpose logDebug: false diff --git a/cmd/core/main.go b/cmd/core/main.go index 0fef9e1d8..b5d63610c 100644 --- a/cmd/core/main.go +++ b/cmd/core/main.go @@ -193,7 +193,7 @@ func main() { // wrapper the round tripper by multi cluster rewriter if enableClusterGateway { if _, err := multicluster.Initialize(restConfig, true); err != nil { - klog.ErrorS(err, "failed to enable multicluster") + klog.ErrorS(err, "failed to enable multi-cluster capability") os.Exit(1) } }