From c8b41be7bd1bef6133a5895c396c2a0e120d8303 Mon Sep 17 00:00:00 2001 From: schrodit Date: Fri, 10 Nov 2023 09:33:43 +0100 Subject: [PATCH] Add support for Gardener 1.75 --- default.yaml | 2 +- .../deployment-kube-controller-manager.yaml | 3 +- src/ts/versions/installations.ts | 1 + .../components/charts/VirtualClusterChart.ts | 1 - src/ts/versions/v1.46/installation.ts | 2 - src/ts/versions/v1.47/installation.ts | 1 - src/ts/versions/v1.75/extensions.yaml | 104 ++++++++++++++++++ 7 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 src/ts/versions/v1.75/extensions.yaml diff --git a/default.yaml b/default.yaml index 3eb9c82..80c8289 100644 --- a/default.yaml +++ b/default.yaml @@ -1,5 +1,5 @@ -version: v1.74.3 +version: v1.75.2 landscapeName: gardener-installation diff --git a/src/charts/host/virtual-cluster/templates/deployment-kube-controller-manager.yaml b/src/charts/host/virtual-cluster/templates/deployment-kube-controller-manager.yaml index c87e922..be09692 100644 --- a/src/charts/host/virtual-cluster/templates/deployment-kube-controller-manager.yaml +++ b/src/charts/host/virtual-cluster/templates/deployment-kube-controller-manager.yaml @@ -64,6 +64,7 @@ spec: - --authentication-kubeconfig=/srv/kubernetes/controller-manager/kubeconfig - --kubeconfig=/srv/kubernetes/controller-manager/kubeconfig - --root-ca-file=/srv/kubernetes/ca/ca.crt + - --secure-port=10257 - --service-account-private-key-file=/srv/kubernetes/service-account-key/service_account.key - --use-service-account-credentials=true - --v=2 @@ -71,7 +72,7 @@ spec: failureThreshold: 2 httpGet: path: /healthz - port: 10252 + port: 10257 scheme: HTTP initialDelaySeconds: 15 periodSeconds: 10 diff --git a/src/ts/versions/installations.ts b/src/ts/versions/installations.ts index 8b8ec7f..119d22a 100644 --- a/src/ts/versions/installations.ts +++ b/src/ts/versions/installations.ts @@ -66,6 +66,7 @@ const versions: Record = { 'v1.72.x': Installation_1_62, 'v1.73.x': Installation_1_62, 'v1.74.x': Installation_1_74, + 'v1.75.x': Installation_1_74, }; export class VersionNotFound extends Exception { diff --git a/src/ts/versions/v1.46/components/charts/VirtualClusterChart.ts b/src/ts/versions/v1.46/components/charts/VirtualClusterChart.ts index 3f8d654..2d4e8c6 100644 --- a/src/ts/versions/v1.46/components/charts/VirtualClusterChart.ts +++ b/src/ts/versions/v1.46/components/charts/VirtualClusterChart.ts @@ -14,7 +14,6 @@ export class VirtualClusterChart extends Chart { } public async renderValues(values: VirtualClusterChartValues): Promise { - console.log('virtual cluster', values.apiserver.version); return { name: 'virtual-cluster', apiServer: { diff --git a/src/ts/versions/v1.46/installation.ts b/src/ts/versions/v1.46/installation.ts index 5a2b301..2a51765 100644 --- a/src/ts/versions/v1.46/installation.ts +++ b/src/ts/versions/v1.46/installation.ts @@ -41,9 +41,7 @@ export class Installation implements IInstallation { stateValues = emptyState(inputValues.version); } - console.log('aaaa', stateValues.apiserver.version); const values = await generateGardenerInstallationValues(stateValues, inputValues); - console.log('aaaa', values.apiserver.version); await this.state.store(stateValues, inputValues); log.info('Successfully stored state'); diff --git a/src/ts/versions/v1.47/installation.ts b/src/ts/versions/v1.47/installation.ts index 0a8c7e5..34ee3d4 100644 --- a/src/ts/versions/v1.47/installation.ts +++ b/src/ts/versions/v1.47/installation.ts @@ -25,7 +25,6 @@ export class Installation extends Installation_1_46 { throw new Error('State values invalid'); } if (has(stateValues.apiserver.tls) && stateValues.apiserver.tls.ca.messageDigest !== MessageDigest.SHA384) { - console.log(stateValues.apiserver.tls.ca.messageDigest); delete stateValues.apiserver.tls; } if (has(stateValues.apiserver.aggregator.tls) && stateValues.apiserver.aggregator.tls.ca.messageDigest !== MessageDigest.SHA384) { diff --git a/src/ts/versions/v1.75/extensions.yaml b/src/ts/versions/v1.75/extensions.yaml new file mode 100644 index 0000000..512188a --- /dev/null +++ b/src/ts/versions/v1.75/extensions.yaml @@ -0,0 +1,104 @@ + +gardener: + extensions: + os-coreos: + enabled: true + version: v1.16.0 + controllerRegistration: + repositoryName: gardener-extension-os-coreos + + os-ubuntu: + enabled: true + version: v1.23.0 + controllerRegistration: + repositoryName: gardener-extension-os-ubuntu + + provider-gcp: + enabled: true + version: v1.32.1 + controllerRegistration: + repositoryName: gardener-extension-provider-gcp + + provider-openstack: + enabled: true + version: v1.37.1 + controllerRegistration: + repositoryName: gardener-extension-provider-openstack + + provider-dns-cloudflare: + enabled: true + version: v0.0.6 + controllerRegistration: + org: schrodit + repositoryName: gardener-extension-provider-dns-cloudflare + + provider-equinix: + enabled: true + version: v2.9.0 + controllerRegistration: + repositoryName: gardener-extension-provider-equinix-metal + values: + image: + tag: v2.10.0-dev-6b7b511317539bc6b47b2702cda4d621b6d1f6ee + + networking-cilium: + enabled: true + version: v1.30.2 + controllerRegistration: + repositoryName: gardener-extension-networking-cilium + + networking-calico: + enabled: true + version: v1.37.0 + controllerRegistration: + repositoryName: gardener-extension-networking-calico + + shoot-dns-service: + enabled: true + global: true + + version: v1.38.3 + controllerRegistration: + repositoryName: gardener-extension-shoot-dns-service + + values: + dnsProviderReplication: + enabled: true + dnsProviderManagement: + enabled: true + dnsControllerManager: + image: + repository: eu.gcr.io/gardener-project/dns-controller-manager + tag: v0.13.3 + configuration: + cacheTtl: 300 + controllers: dnscontrollers,dnssources + dnsPoolResyncPeriod: 30m + #poolSize: 20 + #providersPoolResyncPeriod: 24h + serverPortHttp: 8080 + createCRDs: false + deploy: true + replicaCount: 1 + #resources: + # limits: + # memory: 1Gi + # requests: + # cpu: 50m + # memory: 500Mi + + shoot-cert-service: + enabled: true + global: true + + version: v1.38.0 + controllerRegistration: + repositoryName: gardener-extension-shoot-cert-service + + values: + certificateConfig: + defaultIssuer: + acme: + email: foo@example.com + server: https://acme-v02.api.letsencrypt.org/directory + name: default-issuer