Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove fallback to read cluster ca Secret #2164

Merged
merged 1 commit into from
Nov 5, 2024
Merged

Remove fallback to read cluster ca Secret #2164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions backend/lib/services/shoots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down