Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into gardener-local
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gerrit91
Gerrit91 committed Nov 20, 2024
2 parents a5da176 + b2f3a1f commit 78fe958
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
8 changes: 8 additions & 0 deletions control-plane/roles/gardener/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,14 @@ This includes the metal-stack extension provider called [gardener-extension-prov
| gardener_extension_networking_cilium_enabled | | If enabled, deploys the gardener-networking-extension-cilium |
| gardener_extension_shoot_cert_service_enabled | | If enabled, deploys the gardener-extension-shoot-cert-service |
| gardener_extension_shoot_dns_service_enabled | | If enabled, deploys the gardener-extension-shoot-dns-service |
| gardener_extension_backup_s3_enabled | | If enabled, deploys the gardener-extension-backup-s3 |
| gardener_extension_dns_powerdns_enabled | | If enabled, deploys the gardener-extension-dns-powerdns |
| gardener_os_controller_repo_ref | | A repo reference for deploying the [os-metal-extension](https://github.com/metal-stack/os-metal-extension/) |
| gardener_networking_cilium_repo_ref | | A repo reference for deploying the [gardener-extension-networking-cilium](https://github.com/gardener/gardener-extension-networking-cilium) |
| gardener_extension_provider_metal_repo_ref | | A repo reference for deploying the [gardener-extension-provider-metal](https://github.com/metal-stack/gardener-extension-provider-metal) |
| gardener_shoot_dns_service_repo_ref | | A repo reference for deploying the [gardener-extension-shoot-dns-service](https://github.com/gardener/gardener-extension-shoot-dns-service) |
| gardener_extension_backup_s3_repo_ref | | A repo reference for deploying the [gardener-extension-backup-s3](https://github.com/metal-stack/gardener-extension-backup-s3) |
| gardener_extension_dns_powerdns_repo_ref | | A repo reference for deploying the [gardener-extension-dns-powerdns](https://github.com/metal-stack/gardener-extension-dns-powerdns) |
| gardener_metal_admission_replicas | | Specifies the amount of metal-admission webhook replicas |
| gardener_metal_admission_vpa | | Enables the VPA for the metal-admission webhook |
| gardener_extension_provider_metal_cluster_audit_enabled | | Enables the audit functionality of the GEPM |
Expand All @@ -122,6 +126,10 @@ This includes the metal-stack extension provider called [gardener-extension-prov
| gardener_shoot_dns_service_image_vector_overwrite | | Allows overriding the image vector for the shoot-dns-service extension |
| gardener_shoot_dns_service_dns_controller_manager_image_name | | Setting an explicit image name for the dns-controller-manager |
| gardener_shoot_dns_service_dns_controller_manager_image_tag | | Setting an explicit image tag for the dns-controller-manager |
| gardener_extension_backup_s3_image_name | | Setting an explicit image name for the gardener-extension-backup-s3 |
| gardener_extension_backup_s3_image_tag | | Setting an explicit image tag for the gardener-extension-backup-s3 |
| gardener_extension_dns_powerdns_image_name | | Setting an explicit image name for the gardener-extension-dns-powerdns |
| gardener_extension_dns_powerdns_image_tag | | Setting an explicit image tag for the gardener-extension-dns-powerdns |

### Certificates

Expand Down
7 changes: 0 additions & 7 deletions control-plane/roles/gardener/defaults/main/extensions.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
---
# TODO: move to image vector
gardener_extension_backup_s3_image_tag: gardener-v1.100
gardener_extension_backup_s3_image_name: ghcr.io/metal-stack/gardener-extension-backup-s3
gardener_extension_dns_powerdns_image_tag: gardener-v1.100
gardener_extension_dns_powerdns_image_name: ghcr.io/metal-stack/gardener-extension-dns-powerdns
# END TODO

gardener_extension_networking_calico_enabled: true
gardener_extension_networking_cilium_enabled: true
gardener_extension_os_metal_enabled: true
Expand Down
4 changes: 4 additions & 0 deletions defaults/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ metal_stack_release:
gardener_mcm_provider_metal_image_tag: "docker-images.metal-stack.gardener.machine-controller-manager-provider-metal.tag"
gardener_extension_audit_image_name: "docker-images.metal-stack.gardener.gardener-extension-audit.name"
gardener_extension_audit_image_tag: "docker-images.metal-stack.gardener.gardener-extension-audit.tag"
gardener_extension_backup_s3_image_tag: "docker-images.metal-stack.gardener.gardener-extension-backup-s3.tag"
gardener_extension_backup_s3_image_name: "docker-images.metal-stack.gardener.gardener-extension-backup-s3.name"
gardener_extension_dns_powerdns_image_tag: "docker-images.metal-stack.gardener.gardener-extension-dns-powerdns.tag"
gardener_extension_dns_powerdns_image_name: "docker-images.metal-stack.gardener.gardener-extension-dns-powerdns.name"
# kubernetes
csi_lvm_controller_image_tag: "docker-images.metal-stack.kubernetes.csi-lvm-controller.tag"
csi_lvm_controller_image_name: "docker-images.metal-stack.kubernetes.csi-lvm-controller.name"
Expand Down

0 comments on commit 78fe958

Please sign in to comment.