Merge branch 'master' into s3-backup-restore-sidecar

.gitignore

@@ -7,3 +7,4 @@
 .shoot*
 __pycache__
 .Trash*
+*~

control-plane/roles/gardener/defaults/main/certs.yaml

@@ -26,10 +26,6 @@ gardener_controller_manager_ca:
 gardener_controller_manager_cert:
 gardener_controller_manager_key:
 
-gardener_metal_admission_controller_ca:
-gardener_metal_admission_controller_cert:
-gardener_metal_admission_controller_key:
-
 gardener_etcd_ca_cert:
 gardener_etcd_cert:
 gardener_etcd_cert_key:

control-plane/roles/gardener/defaults/main/cloud_profile.yaml

@@ -21,12 +21,8 @@ gardener_os_cri_mapping:
     cris:
     - name: containerd
       containerRuntimes: []
-    - name: docker
-      containerRuntimes: []
   debian:
     when:
     cris:
     - name: containerd
       containerRuntimes: []
-    - name: docker
-      containerRuntimes: []

control-plane/roles/gardener/defaults/main/extensions.yaml

@@ -1,12 +1,20 @@
 ---
-gardener_os_controller_repo_ref: "{{ gardener_os_controller_image_tag }}"
+gardener_extension_networking_calico_enabled: true
+gardener_extension_networking_cilium_enabled: true
+gardener_extension_os_metal_enabled: true
+gardener_extension_provider_gcp_enabled: true
+gardener_extension_provider_metal_enabled: true
+gardener_extension_shoot_cert_service_enabled: true
+gardener_extension_shoot_dns_service_enabled: true
+
+gardener_extension_provider_metal_repo_ref: "{{ gardener_extension_provider_metal_image_tag }}"
 gardener_networking_cilium_repo_ref: "gardener/gardener-extension-networking-cilium/{{ gardener_networking_cilium_image_tag }}"
+gardener_os_controller_repo_ref: "{{ gardener_os_controller_image_tag }}"
+gardener_shoot_dns_service_repo_ref: "gardener/gardener-extension-shoot-dns-service/{{ gardener_shoot_dns_service_image_tag }}"
 
 gardener_metal_admission_replicas: 1
 gardener_metal_admission_vpa: true
 
-gardener_extension_provider_metal_repo_ref: "{{ gardener_extension_provider_metal_image_tag }}"
-
 gardener_extension_provider_metal_cluster_audit_enabled: false
 gardener_extension_provider_metal_audit_to_splunk_enabled: false
 gardener_extension_provider_metal_audit_to_splunk:
@@ -18,6 +26,7 @@ gardener_extension_provider_metal_audit_to_splunk:
   # tlsEnabled: true
   # hecCAFile: ""
 
+gardener_extension_provider_metal_etcd_storage_class_name:
 gardener_extension_provider_metal_etcd_backup_schedule: "0 */2 * * *"
 gardener_extension_provider_metal_etcd_delta_snapshot_period: "5m"
 
@@ -57,5 +66,23 @@ gardener_extension_provider_metal_image_pull_secret:
   # ...
 
 gardener_cert_management_issuer_private_key: ""
+gardener_cert_management_issuer_server: https://acme-v02.api.letsencrypt.org/directory
+gardener_cert_management_issuer_email:
+gardener_cert_management_precheck_nameservers: []
+gardener_cert_management_shoot_issuers_enabled: false
 
 gardener_extension_dns_external_controller_registration_url:
+
+gardener_extension_networking_cilium_image_vector_overwrite: []
+  # - name: <image-name>
+  #   sourceRepository: /source/repository
+  #   repository: /repository
+  #   tag: <tag>
+
+gardener_shoot_dns_service_image_vector_overwrite: []
+  # - name: dns-controller-manager
+  #   sourceRepository: github.com/gardener/external-dns-management
+  #   repository: europe-docker.pkg.dev/gardener-project/public/dns-controller-manager
+  #   tag: "0.7.1"
+gardener_shoot_dns_service_dns_controller_manager_image_name:
+gardener_shoot_dns_service_dns_controller_manager_image_tag:

control-plane/roles/gardener/defaults/main/gardener.yaml

@@ -35,12 +35,32 @@ gardener_dns_domain:
 gardener_dns_provider:
 
 gardener_backup_infrastructure:
+  # provider: gcp
+  # region:
+  # secretRef:
+  #  name: backup-secret
+  #  namespace: garden
+  # bucket:
+  #
+  # provider: S3
+  # endpoint: "{{ gardener_backup_infrastructure_secret.endpoint | b64decode }}"
+  # accessKeyID: "{{ gardener_backup_infrastructure_secret.accessKeyID | b64decode }}"
+  # secretAccessKey: "{{ gardener_backup_infrastructure_secret.secretAccessKey | b64decode}}"
+
 gardener_backup_infrastructure_secret:
+  # for gcp:
+  # serviceaccount.json: "{{ gardener_backup_infrastructure_service_account_json | b64encode }}"
+  #
+  # for S3:
+  # endpoint:
+  # accessKeyID:
+  # secretAccessKey:
 
 gardener_soil_name: "{{ metal_control_plane_stage_name }}"
 gardener_soil_kubeconfig_file_path: "{{ lookup('env', 'KUBECONFIG') }}"
 gardener_soil_vertical_pod_autoscaler_enabled: false
 gardener_soil_project_owner_name: admin
+gardener_soil_project_members: []
 
 gardener_gardenlet_shoot_concurrent_syncs: 20
 gardener_gardenlet_shoot_reconcile_in_maintenance_only: false