Skip to content

Commit c1408ac

Browse files
authored
remove defaultSecret warning message (#2085)
* remove defaultSecret warning message * add changelog=entry
1 parent 1fee765 commit c1408ac

File tree

2 files changed

+3
-28
lines changed

2 files changed

+3
-28
lines changed

.changelog/2085.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
`kubernetes/resource_kubernetes_service_account.go`: Remove `default_secret_name` warning
3+
```

kubernetes/resource_kubernetes_service_account.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,6 @@ func findDefaultServiceAccount(ctx context.Context, sa *api.ServiceAccount, conn
180180
*/
181181
ds := make([]string, 0)
182182

183-
sv, err := serverVersionGreaterThanOrEqual(conn, "1.24.0")
184-
if err != nil {
185-
return "", diag.FromErr(err)
186-
}
187-
if sv {
188-
return "", diag.Diagnostics{
189-
diag.Diagnostic{
190-
Severity: diag.Warning,
191-
Summary: `"default_secret_name" is no longer applicable for Kubernetes v1.24.0 and above`,
192-
Detail: `Starting from version 1.24.0 Kubernetes does not automatically generate a token for service accounts, in this case, "default_secret_name" will be empty`,
193-
},
194-
}
195-
}
196-
197183
for _, saSecret := range sa.Secrets {
198184
if !strings.HasPrefix(saSecret.Name, fmt.Sprintf("%s-token-", sa.Name)) {
199185
log.Printf("[DEBUG] Skipping %s as it doesn't have the right name", saSecret.Name)
@@ -319,20 +305,6 @@ func resourceKubernetesServiceAccountRead(ctx context.Context, d *schema.Resourc
319305
return diag.FromErr(err)
320306
}
321307

322-
sv, err := serverVersionGreaterThanOrEqual(conn, "1.24.0")
323-
if err != nil {
324-
return diag.FromErr(err)
325-
}
326-
if sv {
327-
return diag.Diagnostics{
328-
diag.Diagnostic{
329-
Severity: diag.Warning,
330-
Summary: `"default_secret_name" is no longer applicable for Kubernetes v1.24.0 and above`,
331-
Detail: `Starting from version 1.24.0 Kubernetes does not automatically generate a token for service accounts, in this case, "default_secret_name" will be empty`,
332-
},
333-
}
334-
}
335-
336308
return nil
337309
}
338310

0 commit comments

Comments
 (0)