diff --git a/control-plane/roles/gardener/README.md b/control-plane/roles/gardener/README.md index 9030a3c0..f843fb47 100644 --- a/control-plane/roles/gardener/README.md +++ b/control-plane/roles/gardener/README.md @@ -38,6 +38,7 @@ Check out the Gardener project for further documentation on [gardener.cloud](htt | gardener_kube_api_server_kubeconfig | | The kubeconfig for the Gardener Kubernetes API (virtual garden apiserver) | | gardener_kube_apiserver_kubeconfig_path | | The acts on multiple Kubernetes APIs, this is where it puts the kubeconfig of the Gardener Kubernetes API | | gardener_local_tmp_dir | | The acts on multiple Kubernetes APIs, this is a local folder in the deployment container to store the kubeconfigs (ephemeral) | +| gardener_logging_enabled | | Specifies whether the logging Gardener logging stack should be activated in the Gardenlet | ### Virtual Garden diff --git a/control-plane/roles/gardener/defaults/main/gardener.yaml b/control-plane/roles/gardener/defaults/main/gardener.yaml index b062f5f6..eac992ff 100644 --- a/control-plane/roles/gardener/defaults/main/gardener.yaml +++ b/control-plane/roles/gardener/defaults/main/gardener.yaml @@ -110,3 +110,5 @@ gardener_shooted_seed_rollout_delay_minutes: gardener_kube_api_server_kubeconfig: "{{ 'garden-kube-apiserver' | kubeconfig_from_cert(gardener_kube_api_server_ca, gardener_kube_api_server_client_cert, gardener_kube_api_server_client_key, prepend_https=true) }}" gardener_kube_apiserver_kubeconfig_path: "{{ gardener_local_tmp_dir }}/garden-kube-apiserver-kubeconfig" gardener_local_tmp_dir: "{{ playbook_dir }}/.ansible/tmp" + +gardener_logging_enabled: false diff --git a/control-plane/roles/gardener/templates/gardenlet-values.j2 b/control-plane/roles/gardener/templates/gardenlet-values.j2 index d041d83c..b8e0f9f0 100644 --- a/control-plane/roles/gardener/templates/gardenlet-values.j2 +++ b/control-plane/roles/gardener/templates/gardenlet-values.j2 @@ -22,6 +22,11 @@ config: # allow setting shoot ignore annotation: respectSyncPeriodOverwrite: {{ gardener_gardenlet_shoot_respect_sync_period_overwrite }} +{% if gardener_logging_enabled %} + logging: + enabled: true +{% endif %} + seedConfig: apiVersion: core.gardener.cloud/v1beta1 kind: Seed @@ -78,4 +83,4 @@ imageVectorOverwrite: | {% if gardener_component_image_vector_overwrite %} componentImageVectorOverwrites: | {{ gardener_component_image_vector_overwrite | to_yaml | indent(width=4, first=false) }} -{% endif %} +{% endif %} \ No newline at end of file diff --git a/control-plane/roles/gardener/templates/managed-seed.j2 b/control-plane/roles/gardener/templates/managed-seed.j2 index 336a5297..a79b5f7c 100644 --- a/control-plane/roles/gardener/templates/managed-seed.j2 +++ b/control-plane/roles/gardener/templates/managed-seed.j2 @@ -40,6 +40,11 @@ spec: visible: {{ gardener_shooted_seed.visible | default(true) }} shootDNS: enabled: true +{% if gardener_logging_enabled %} + logging: + enabled: true +{% endif %} + deployment: image: pullPolicy: IfNotPresent @@ -48,4 +53,4 @@ spec: vpa: true mergeWithParent: true shoot: - name: "{{ gardener_shooted_seed.name }}" + name: "{{ gardener_shooted_seed.name }}" \ No newline at end of file