From cd07ae4975d3a778a3988e074663f017b2608f90 Mon Sep 17 00:00:00 2001
From: Gerrit <Gerrit91@users.noreply.github.com>
Date: Wed, 10 May 2023 14:26:32 +0200
Subject: [PATCH] Enforce old service account secrets in k8s 1.24. (#36)
---
api/v2/helper/seed_access.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/api/v2/helper/seed_access.go b/api/v2/helper/seed_access.go
index 86f5860..9eb9955 100644
--- a/api/v2/helper/seed_access.go
+++ b/api/v2/helper/seed_access.go
@@ -80,7 +80,7 @@ func ensureSeedRBAC(ctx context.Context, seedConfig *rest.Config, deploy *v2.Fir
return fmt.Errorf("error ensuring service account: %w", err)
}
- if versionGreaterOrEqual125(k8sVersion) {
+ if versionGreaterOrEqual124(k8sVersion) {
serviceAccountSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,
@@ -198,7 +198,7 @@ func ensureShootRBAC(ctx context.Context, shootConfig *rest.Config, shootNamespa
return fmt.Errorf("error ensuring service account: %w", err)
}
- if versionGreaterOrEqual125(k8sVersion) {
+ if versionGreaterOrEqual124(k8sVersion) {
serviceAccountSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,
@@ -293,8 +293,8 @@ func determineK8sVersion(config *rest.Config) (*semver.Version, error) {
return k8sVersion, nil
}
-func versionGreaterOrEqual125(v *semver.Version) bool {
- constraint, err := semver.NewConstraint(">=v1.25.0")
+func versionGreaterOrEqual124(v *semver.Version) bool {
+ constraint, err := semver.NewConstraint(">=v1.24.0")
if err != nil {
return false
}
@@ -359,7 +359,7 @@ func GetAccessKubeconfig(c *AccessConfig) ([]byte, error) {
return nil, fmt.Errorf("unable to create client: %w", err)
}
- if versionGreaterOrEqual125(k8sVersion) {
+ if versionGreaterOrEqual124(k8sVersion) {
saSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,