Remove fallback to read cluster ca Secret (#2164)

gardener · Nov 5, 2024 · 83a5e61 · 83a5e61
1 parent f46cf6b
commit 83a5e61
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/backend/lib/services/shoots.js b/backend/lib/services/shoots.js
@@ -386,18 +386,8 @@ async function getGardenClusterIdentity () {
 exports.getGardenClusterIdentity = getGardenClusterIdentity
 
 async function getClusterCaData (client, { namespace, name }) {
-  try {
-    const configmap = await client.core.configmaps.get(namespace, `${name}.ca-cluster`)
-    return encodeBase64(configmap.data?.['ca.crt'])
-  } catch (err) {
-    // TODO(petersutter): Remove this fallback of reading the `<shoot-name>.ca-cluster` Secret when Gardener no longer reconciles it, presumably with Gardener v1.97.
-    if (isHttpError(err, 404)) {
-      const caCluster = await client.core.secrets.get(namespace, `${name}.ca-cluster`)
-      return caCluster.data?.['ca.crt']
-    } else {
-      throw err
-    }
-  }
+  const configmap = await client.core.configmaps.get(namespace, `${name}.ca-cluster`)
+  return encodeBase64(configmap.data?.['ca.crt'])
 }
 exports.getClusterCaData = getClusterCaData