Add support for Gardener 1.75

schrodit · Nov 10, 2023 · c8b41be · c8b41be
1 parent e594e05
commit c8b41be
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 6 deletions.
diff --git 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
@@ -64,14 +64,15 @@ 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
         livenessProbe:
           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
@@ -66,6 +66,7 @@ const versions: Record<string, InstallationConstructor> = {
     '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
@@ -14,7 +14,6 @@ export class VirtualClusterChart extends Chart<VirtualClusterChartValues> {
     }
 
     public async renderValues(values: VirtualClusterChartValues): Promise<Values> {
-        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
@@ -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
@@ -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
@@ -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