Skip to content

Commit

Permalink
Remove provider-local again.
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerrit91 committed Nov 20, 2024
1 parent e28f42b commit 07912ea
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 67 deletions.
1 change: 0 additions & 1 deletion control-plane/roles/gardener/defaults/main/extensions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ 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_local_enabled: false

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 }}"
Expand Down
39 changes: 0 additions & 39 deletions control-plane/roles/gardener/tasks/extensions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,45 +29,6 @@
- controller-registration.yaml
when: gardener_extension_provider_gcp_enabled

- name: "Register controller: provider-local"
k8s:
definition: "{{ lookup('template', 'provider-local/{{ item }}', split_lines=False) }}"
kubeconfig: "{{ gardener_kube_apiserver_kubeconfig_path }}"
apply: yes
tags: provider-local
register: result
until: result is success
retries: 10
delay: 6
loop:
- controller-deployment.yaml
- controller-registration.yaml
when: gardener_extension_provider_local_enabled

- name: Create provider-local domain secrets
k8s:
kubeconfig: "{{ gardener_kube_apiserver_kubeconfig_path }}"
apply: yes
definition:
apiVersion: v1
kind: Secret
metadata:
name: "{{ item.role }}-{{ item.name }}-local-gardener-cloud"
namespace: garden
labels:
app: gardener
gardener.cloud/role: "{{ item.role }}"
annotations:
dns.gardener.cloud/provider: local
dns.gardener.cloud/domain: "{{ item.name }}.local.gardener.cloud"
type: Opaque
loop:
- name: external
role: default-domain
- name: internal
role: internal-domain
when: gardener_extension_provider_local_enabled

- name: "Register controller: os extension provider metal"
k8s:
definition: "{{ lookup('template', 'os-metal-extension/{{ item }}', split_lines=False) }}"
Expand Down
1 change: 0 additions & 1 deletion control-plane/roles/gardener/tasks/gardener.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
data: "{{ gardener_dns_credentials }}"
kubeconfig: "{{ gardener_kube_apiserver_kubeconfig_path }}"
apply: true
when: gardener_dns_provider != 'local'
loop:
- internal-domain
- default-domain
Expand Down
2 changes: 1 addition & 1 deletion control-plane/roles/gardener/tasks/virtual_garden.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@
- name: Wait for garden-kube-apiserver
wait_for:
host: "{{ gardener_virtual_api_server_public_dns }}"
port: "{{ gardener_virtual_api_server_public_wait_port }}"
port: "443"
timeout: 60

This file was deleted.

This file was deleted.

0 comments on commit 07912ea

Please sign in to comment.