wip

hashicorp · Nov 20, 2020 · 11bbed6 · 11bbed6
1 parent 5093267
commit 11bbed6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/kubernetes/resource_kubernetes_daemonset_test.go b/kubernetes/resource_kubernetes_daemonset_test.go
@@ -653,7 +653,7 @@ func testAccKubernetesDaemonSetWithInitContainer(depName, imageName string) stri
  spec {
  init_container {
  name = "hello"
- image = imageName
+ image = "%s"
  command = ["echo", "'hello'"]
  }
 
@@ -665,7 +665,7 @@ func testAccKubernetesDaemonSetWithInitContainer(depName, imageName string) stri
  }
  }
 }
-`, depName, imageName)
+`, depName, imageName, imageName)
 }
 
 func testAccKubernetesDaemonSetWithNoTopLevelLabels(depName, imageName string) string {

diff --git a/kubernetes/resource_kubernetes_deployment_test.go b/kubernetes/resource_kubernetes_deployment_test.go
@@ -1295,7 +1295,7 @@ func testAccKubernetesDeploymentConfig_initContainer(name, image string) string
  }
 
  init_container {
- name = containername
+ name = "containername"
  image = "%s"
  command = ["sh", "-c", "until nslookup init-service.default.svc.cluster.local; do echo waiting for init-service; sleep 2; done"]
 

diff --git a/kubernetes/resource_kubernetes_job_test.go b/kubernetes/resource_kubernetes_job_test.go
@@ -116,8 +116,11 @@ func TestAccKubernetesJob_ttl_seconds_after_finished(t *testing.T) {
  name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 
  resource.Test(t, resource.TestCase{
- PreCheck: func() { testAccPreCheck(t) },
- IDRefreshName: "kubernetes_job.test",
+ PreCheck: func() { testAccPreCheck(t) },
+ IDRefreshName: "kubernetes_job.test",
+ IDRefreshIgnore: []string{
+ "spec.0.selector.0.match_expressions.#",
+ },
  ProviderFactories: testAccProviderFactories,
  CheckDestroy: testAccCheckKubernetesJobDestroy,
  Steps: []resource.TestStep{

diff --git a/kubernetes/resource_kubernetes_persistent_volume_test.go b/kubernetes/resource_kubernetes_persistent_volume_test.go
@@ -643,7 +643,7 @@ func TestAccKubernetesPersistentVolume_hostPath_nodeAffinity(t *testing.T) {
  resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.node_affinity.#", "1"),
  resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.node_affinity.0.required.#", "1"),
  resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", "spec.0.node_affinity.0.required.0.node_selector_term.#", "1"),
- resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", fmt.Sprintf("%s.match_expressions.#", keyName), "1"),
+ resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", fmt.Sprintf("%s.#", keyName), "1"),
  resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", fmt.Sprintf("%s.0.key", keyName), "selectorLabelTest"),
  resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", fmt.Sprintf("%s.0.operator", keyName), "In"),
  resource.TestCheckResourceAttr("kubernetes_persistent_volume.test", fmt.Sprintf("%s.0.values.#", keyName), "1"),