diff --git a/charts/kyverno/README.md b/charts/kyverno/README.md index 8e6c2e227d..b99188b3f1 100644 --- a/charts/kyverno/README.md +++ b/charts/kyverno/README.md @@ -293,6 +293,8 @@ The chart values are organised per component. | features.configMapCaching.enabled | bool | `true` | Enables the feature | | features.dumpPayload.enabled | bool | `false` | Enables the feature | | features.forceFailurePolicyIgnore.enabled | bool | `false` | Enables the feature | +| features.logging.format | string | `"text"` | Logging format | +| features.logging.verbosity | int | `2` | Logging verbosity | | features.policyExceptions.enabled | bool | `false` | Enables the feature | | features.policyExceptions.namespace | string | `""` | Restrict policy exceptions to a single namespace | | features.protectManagedResources.enabled | bool | `false` | Enables the feature | @@ -375,8 +377,6 @@ The chart values are organised per component. | admissionController.tracing.address | string | `nil` | Traces receiver address | | admissionController.tracing.port | string | `nil` | Traces receiver port | | admissionController.tracing.creds | string | `""` | Traces receiver credentials | -| admissionController.logging.format | string | `"text"` | Logging format | -| admissionController.logging.verbosity | int | `2` | Logging verbosity | | admissionController.metering.disabled | bool | `false` | Disable metrics export | | admissionController.metering.config | string | `"prometheus"` | Otel configuration, can be `prometheus` or `grpc` | | admissionController.metering.port | int | `8000` | Prometheus endpoint port | @@ -435,8 +435,6 @@ The chart values are organised per component. | backgroundController.tracing.address | string | `nil` | Traces receiver address | | backgroundController.tracing.port | string | `nil` | Traces receiver port | | backgroundController.tracing.creds | string | `""` | Traces receiver credentials | -| backgroundController.logging.format | string | `"text"` | Logging format | -| backgroundController.logging.verbosity | int | `2` | Logging verbosity | | backgroundController.metering.disabled | bool | `false` | Disable metrics export | | backgroundController.metering.config | string | `"prometheus"` | Otel configuration, can be `prometheus` or `grpc` | | backgroundController.metering.port | int | `8000` | Prometheus endpoint port | @@ -503,8 +501,6 @@ The chart values are organised per component. | cleanupController.tracing.address | string | `nil` | Traces receiver address | | cleanupController.tracing.port | string | `nil` | Traces receiver port | | cleanupController.tracing.creds | string | `""` | Traces receiver credentials | -| cleanupController.logging.format | string | `"text"` | Logging format | -| cleanupController.logging.verbosity | int | `2` | Logging verbosity | | cleanupController.metering.disabled | bool | `false` | Disable metrics export | | cleanupController.metering.config | string | `"prometheus"` | Otel configuration, can be `prometheus` or `grpc` | | cleanupController.metering.port | int | `8000` | Prometheus endpoint port | @@ -565,8 +561,6 @@ The chart values are organised per component. | reportsController.tracing.address | string | `nil` | Traces receiver address | | reportsController.tracing.port | string | `nil` | Traces receiver port | | reportsController.tracing.creds | string | `nil` | Traces receiver credentials | -| reportsController.logging.format | string | `"text"` | Logging format | -| reportsController.logging.verbosity | int | `2` | Logging verbosity | | reportsController.metering.disabled | bool | `false` | Disable metrics export | | reportsController.metering.config | string | `"prometheus"` | Otel configuration, can be `prometheus` or `grpc` | | reportsController.metering.port | int | `8000` | Prometheus endpoint port | diff --git a/charts/kyverno/templates/_helpers.tpl b/charts/kyverno/templates/_helpers.tpl index a605912ddd..a45367d942 100644 --- a/charts/kyverno/templates/_helpers.tpl +++ b/charts/kyverno/templates/_helpers.tpl @@ -31,6 +31,10 @@ {{- with .forceFailurePolicyIgnore -}} {{- $flags = append $flags (print "--forceFailurePolicyIgnore=" .enabled) -}} {{- end -}} +{{- with .logging -}} + {{- $flags = append $flags (print "--loggingFormat=" .format) -}} + {{- $flags = append $flags (print "--v=" (join "," .verbosity)) -}} +{{- end -}} {{- with .policyExceptions -}} {{- $flags = append $flags (print "--enablePolicyException=" .enabled) -}} {{- $flags = append $flags (print "--exceptionNamespace=" .namespace) -}} diff --git a/charts/kyverno/templates/admission-controller/deployment.yaml b/charts/kyverno/templates/admission-controller/deployment.yaml index 3fe7301e97..621d03f71f 100644 --- a/charts/kyverno/templates/admission-controller/deployment.yaml +++ b/charts/kyverno/templates/admission-controller/deployment.yaml @@ -81,8 +81,9 @@ spec: image: {{ include "kyverno.image" (dict "image" .Values.admissionController.initContainer.image "defaultTag" (default .Chart.AppVersion .Values.admissionController.container.image.tag)) | quote }} imagePullPolicy: {{ default .Values.admissionController.container.image.pullPolicy .Values.admissionController.initContainer.image.pullPolicy }} args: - - --loggingFormat={{ .Values.admissionController.logging.format }} - - --v={{ .Values.admissionController.logging.verbosity }} + {{- include "kyverno.features.flags" (pick (mergeOverwrite .Values.features .Values.admissionController.featuresOverride) + "logging" + ) | nindent 12 }} {{- range $key, $value := .Values.admissionController.initContainer.extraArgs }} {{- if $value }} - --{{ $key }}={{ $value }} @@ -122,8 +123,6 @@ spec: args: - --backgroundServiceAccountName=system:serviceaccount:{{ include "kyverno.namespace" . }}:{{ include "kyverno.background-controller.serviceAccountName" . }} - --servicePort={{ .Values.admissionController.service.port }} - - --loggingFormat={{ .Values.admissionController.logging.format }} - - --v={{ .Values.admissionController.logging.verbosity }} {{- if .Values.admissionController.tracing.enabled }} - --enableTracing - --tracingAddress={{ .Values.admissionController.tracing.address }} @@ -152,6 +151,7 @@ spec: "configMapCaching" "dumpPayload" "forceFailurePolicyIgnore" + "logging" "policyExceptions" "protectManagedResources" "registryClient" diff --git a/charts/kyverno/templates/background-controller/deployment.yaml b/charts/kyverno/templates/background-controller/deployment.yaml index 26bb4ec0c6..c18262c8b3 100644 --- a/charts/kyverno/templates/background-controller/deployment.yaml +++ b/charts/kyverno/templates/background-controller/deployment.yaml @@ -79,8 +79,6 @@ spec: name: metrics protocol: TCP args: - - --loggingFormat={{ .Values.backgroundController.logging.format }} - - --v={{ .Values.backgroundController.logging.verbosity }} {{- if .Values.backgroundController.tracing.enabled }} - --enableTracing - --tracingAddress={{ .Values.backgroundController.tracing.address }} @@ -105,6 +103,7 @@ spec: {{- end }} {{- include "kyverno.features.flags" (pick (mergeOverwrite .Values.features .Values.backgroundController.featuresOverride) "configMapCaching" + "logging" "policyExceptions" ) | nindent 12 }} {{- range $key, $value := .Values.backgroundController.extraArgs }} diff --git a/charts/kyverno/templates/cleanup-controller/deployment.yaml b/charts/kyverno/templates/cleanup-controller/deployment.yaml index e7c3943169..0b7815547e 100644 --- a/charts/kyverno/templates/cleanup-controller/deployment.yaml +++ b/charts/kyverno/templates/cleanup-controller/deployment.yaml @@ -80,8 +80,6 @@ spec: protocol: TCP args: - --servicePort={{ .Values.cleanupController.service.port }} - - --loggingFormat={{ .Values.cleanupController.logging.format }} - - --v={{ .Values.cleanupController.logging.verbosity }} {{- if .Values.cleanupController.tracing.enabled }} - --enableTracing - --tracingAddress={{ .Values.cleanupController.tracing.address }} @@ -103,6 +101,7 @@ spec: {{- end }} {{- include "kyverno.features.flags" (pick (mergeOverwrite .Values.features .Values.cleanupController.featuresOverride) "dumpPayload" + "logging" ) | nindent 12 }} {{- range $key, $value := .Values.cleanupController.extraArgs }} {{- if $value }} diff --git a/charts/kyverno/templates/reports-controller/deployment.yaml b/charts/kyverno/templates/reports-controller/deployment.yaml index 5a7f15e939..d2042cf170 100644 --- a/charts/kyverno/templates/reports-controller/deployment.yaml +++ b/charts/kyverno/templates/reports-controller/deployment.yaml @@ -79,8 +79,6 @@ spec: name: metrics protocol: TCP args: - - --loggingFormat={{ .Values.reportsController.logging.format }} - - --v={{ .Values.reportsController.logging.verbosity }} {{- if .Values.reportsController.tracing.enabled }} - --enableTracing - --tracingAddress={{ .Values.reportsController.tracing.address }} @@ -107,6 +105,7 @@ spec: "admissionReports" "backgroundScan" "configMapCaching" + "logging" "policyExceptions" "reports" "registryClient" diff --git a/charts/kyverno/values.yaml b/charts/kyverno/values.yaml index 9cbb4346c8..ad91c52430 100644 --- a/charts/kyverno/values.yaml +++ b/charts/kyverno/values.yaml @@ -349,6 +349,11 @@ features: forceFailurePolicyIgnore: # -- Enables the feature enabled: false + logging: + # -- Logging format + format: text + # -- Logging verbosity + verbosity: 2 policyExceptions: # -- Enables the feature enabled: false @@ -778,12 +783,6 @@ admissionController: # -- Traces receiver credentials creds: '' - logging: - # -- Logging format - format: text - # -- Logging verbosity - verbosity: 2 - metering: # -- Disable metrics export disabled: false @@ -986,12 +985,6 @@ backgroundController: # -- Traces receiver credentials creds: '' - logging: - # -- Logging format - format: text - # -- Logging verbosity - verbosity: 2 - metering: # -- Disable metrics export disabled: false @@ -1249,12 +1242,6 @@ cleanupController: # -- Traces receiver credentials creds: '' - logging: - # -- Logging format - format: text - # -- Logging verbosity - verbosity: 2 - metering: # -- Disable metrics export disabled: false @@ -1461,12 +1448,6 @@ reportsController: # -- (string) Traces receiver credentials creds: ~ - logging: - # -- Logging format - format: text - # -- Logging verbosity - verbosity: 2 - metering: # -- Disable metrics export disabled: false diff --git a/config/install-latest-testing.yaml b/config/install-latest-testing.yaml index 4b14e5b377..1a731d7506 100644 --- a/config/install-latest-testing.yaml +++ b/config/install-latest-testing.yaml @@ -35286,8 +35286,6 @@ spec: args: - --backgroundServiceAccountName=system:serviceaccount:kyverno:kyverno-background-controller - --servicePort=443 - - --loggingFormat=text - - --v=2 - --disableMetrics=false - --otelConfig=prometheus - --metricsPort=8000 @@ -35296,6 +35294,8 @@ spec: - --enableConfigMapCaching=true - --dumpPayload=false - --forceFailurePolicyIgnore=false + - --loggingFormat=text + - --v=2 - --enablePolicyException=false - --exceptionNamespace= - --protectManagedResources=false @@ -35435,12 +35435,12 @@ spec: name: metrics protocol: TCP args: - - --loggingFormat=text - - --v=2 - --disableMetrics=false - --otelConfig=prometheus - --metricsPort=8000 - --enableConfigMapCaching=true + - --loggingFormat=text + - --v=2 - --enablePolicyException=false - --exceptionNamespace= env: @@ -35527,12 +35527,12 @@ spec: protocol: TCP args: - --servicePort=443 - - --loggingFormat=text - - --v=2 - --disableMetrics=false - --otelConfig=prometheus - --metricsPort=8000 - --dumpPayload=false + - --loggingFormat=text + - --v=2 env: - name: METRICS_CONFIG value: kyverno-metrics @@ -35648,8 +35648,6 @@ spec: name: metrics protocol: TCP args: - - --loggingFormat=text - - --v=2 - --disableMetrics=false - --otelConfig=prometheus - --metricsPort=8000 @@ -35659,6 +35657,8 @@ spec: - --backgroundScanInterval=1h - --skipResourceFilters=true - --enableConfigMapCaching=true + - --loggingFormat=text + - --v=2 - --enablePolicyException=false - --exceptionNamespace= - --reportsChunkSize=1000