@@ -16,9 +16,9 @@ import (
1616func TestAccKubernetesDefaultServiceAccount_basic (t * testing.T ) {
1717 var conf api.ServiceAccount
1818 namespace := fmt .Sprintf ("tf-acc-test-%s" , acctest .RandStringFromCharSet (10 , acctest .CharSetAlphaNum ))
19- resourceName := "kubernetes_default_service_account .test"
19+ resourceName := "kubernetes_default_service_account_v1 .test"
2020
21- resource .Test (t , resource.TestCase {
21+ resource .ParallelTest (t , resource.TestCase {
2222 PreCheck : func () { testAccPreCheck (t ) },
2323 IDRefreshName : resourceName ,
2424 IDRefreshIgnore : []string {"metadata.0.resource_version" },
@@ -58,8 +58,9 @@ func TestAccKubernetesDefaultServiceAccount_secrets(t *testing.T) {
5858 var conf api.ServiceAccount
5959 name := fmt .Sprintf ("tf-acc-test-%s" , acctest .RandStringFromCharSet (10 , acctest .CharSetAlphaNum ))
6060 namespace := fmt .Sprintf ("tf-acc-test-%s" , acctest .RandStringFromCharSet (10 , acctest .CharSetAlphaNum ))
61+ resourceName := "kubernetes_default_service_account_v1.test"
6162
62- resource .Test (t , resource.TestCase {
63+ resource .ParallelTest (t , resource.TestCase {
6364 PreCheck : func () { testAccPreCheck (t ) },
6465 IDRefreshName : "kubernetes_default_service_account.test" ,
6566 IDRefreshIgnore : []string {"metadata.0.resource_version" },
@@ -69,13 +70,13 @@ func TestAccKubernetesDefaultServiceAccount_secrets(t *testing.T) {
6970 {
7071 Config : testAccKubernetesDefaultServiceAccountConfig_secrets (namespace , name ),
7172 Check : resource .ComposeAggregateTestCheckFunc (
72- testAccCheckKubernetesServiceAccountExists ("kubernetes_default_service_account.test" , & conf ),
73- resource .TestCheckResourceAttr ("kubernetes_default_service_account.test" , "metadata.0.name" , "default" ),
74- resource .TestCheckResourceAttrSet ("kubernetes_default_service_account.test" , "metadata.0.generation" ),
75- resource .TestCheckResourceAttrSet ("kubernetes_default_service_account.test" , "metadata.0.resource_version" ),
76- resource .TestCheckResourceAttrSet ("kubernetes_default_service_account.test" , "metadata.0.uid" ),
77- resource .TestCheckResourceAttr ("kubernetes_default_service_account.test" , "secret.#" , "1" ),
78- resource .TestCheckResourceAttr ("kubernetes_default_service_account.test" , "image_pull_secret.#" , "1" ),
73+ testAccCheckKubernetesServiceAccountExists (resourceName , & conf ),
74+ resource .TestCheckResourceAttr (resourceName , "metadata.0.name" , "default" ),
75+ resource .TestCheckResourceAttrSet (resourceName , "metadata.0.generation" ),
76+ resource .TestCheckResourceAttrSet (resourceName , "metadata.0.resource_version" ),
77+ resource .TestCheckResourceAttrSet (resourceName , "metadata.0.uid" ),
78+ resource .TestCheckResourceAttr (resourceName , "secret.#" , "1" ),
79+ resource .TestCheckResourceAttr (resourceName , "image_pull_secret.#" , "1" ),
7980 testAccCheckServiceAccountImagePullSecrets (& conf , []* regexp.Regexp {
8081 regexp .MustCompile ("^" + name + "-two$" ),
8182 }),
@@ -92,9 +93,9 @@ func TestAccKubernetesDefaultServiceAccount_secrets(t *testing.T) {
9293func TestAccKubernetesDefaultServiceAccount_automountServiceAccountToken (t * testing.T ) {
9394 var conf api.ServiceAccount
9495 namespace := fmt .Sprintf ("tf-acc-test-%s" , acctest .RandStringFromCharSet (10 , acctest .CharSetAlphaNum ))
95- resourceName := "kubernetes_default_service_account .test"
96+ resourceName := "kubernetes_default_service_account_v1 .test"
9697
97- resource .Test (t , resource.TestCase {
98+ resource .ParallelTest (t , resource.TestCase {
9899 PreCheck : func () { testAccPreCheck (t ) },
99100 IDRefreshName : resourceName ,
100101 IDRefreshIgnore : []string {"metadata.0.resource_version" },
@@ -123,15 +124,15 @@ func TestAccKubernetesDefaultServiceAccount_automountServiceAccountToken(t *test
123124}
124125
125126func testAccKubernetesDefaultServiceAccountConfig_basic (namespace string ) string {
126- return fmt .Sprintf (`resource "kubernetes_namespace " "test" {
127+ return fmt .Sprintf (`resource "kubernetes_namespace_v1 " "test" {
127128 metadata {
128129 name = "%s"
129130 }
130131}
131132
132- resource "kubernetes_default_service_account " "test" {
133+ resource "kubernetes_default_service_account_v1 " "test" {
133134 metadata {
134- namespace = kubernetes_namespace .test.metadata.0.name
135+ namespace = kubernetes_namespace_v1 .test.metadata.0.name
135136
136137 annotations = {
137138 TestAnnotationOne = "one"
@@ -149,52 +150,52 @@ resource "kubernetes_default_service_account" "test" {
149150}
150151
151152func testAccKubernetesDefaultServiceAccountConfig_secrets (namespace string , name string ) string {
152- return fmt .Sprintf (`resource "kubernetes_namespace " "test" {
153+ return fmt .Sprintf (`resource "kubernetes_namespace_v1 " "test" {
153154 metadata {
154155 name = "%s"
155156 }
156157}
157158
158- resource "kubernetes_default_service_account " "test" {
159+ resource "kubernetes_default_service_account_v1 " "test" {
159160 metadata {
160- namespace = kubernetes_namespace .test.metadata.0.name
161+ namespace = kubernetes_namespace_v1 .test.metadata.0.name
161162 }
162163
163164 secret {
164- name = kubernetes_secret .one.metadata[0].name
165+ name = kubernetes_secret_v1 .one.metadata[0].name
165166 }
166167
167168 image_pull_secret {
168- name = kubernetes_secret .two.metadata[0].name
169+ name = kubernetes_secret_v1 .two.metadata[0].name
169170 }
170171}
171172
172- resource "kubernetes_secret " "one" {
173+ resource "kubernetes_secret_v1 " "one" {
173174 metadata {
174175 name = "%s-one"
175- namespace = kubernetes_namespace .test.metadata.0.name
176+ namespace = kubernetes_namespace_v1 .test.metadata.0.name
176177 }
177178}
178179
179- resource "kubernetes_secret " "two" {
180+ resource "kubernetes_secret_v1 " "two" {
180181 metadata {
181182 name = "%s-two"
182- namespace = kubernetes_namespace .test.metadata.0.name
183+ namespace = kubernetes_namespace_v1 .test.metadata.0.name
183184 }
184185}
185186` , namespace , name , name )
186187}
187188
188189func testAccKubernetesDefaultServiceAccountConfig_automountServiceAccountToken (namespace string ) string {
189- return fmt .Sprintf (`resource "kubernetes_namespace " "test" {
190+ return fmt .Sprintf (`resource "kubernetes_namespace_v1 " "test" {
190191 metadata {
191192 name = "%s"
192193 }
193194}
194195
195- resource "kubernetes_default_service_account " "test" {
196+ resource "kubernetes_default_service_account_v1 " "test" {
196197 metadata {
197- namespace = kubernetes_namespace .test.metadata.0.name
198+ namespace = kubernetes_namespace_v1 .test.metadata.0.name
198199 }
199200
200201 automount_service_account_token = false
0 commit comments