Skip to content

Commit

Permalink
Enforce old service account secrets in k8s 1.24. (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerrit91 authored May 10, 2023
1 parent 7a529d4 commit cd07ae4
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions api/v2/helper/seed_access.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
}
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit cd07ae4

Please sign in to comment.