Update image liveness to agnhost in acceptance tests

hashicorp · Jul 14, 2023 · 3170a7e · 3170a7e
1 parent adf8a69
commit 3170a7e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/kubernetes/resource_kubernetes_deployment_test.go b/kubernetes/resource_kubernetes_deployment_test.go
@@ -392,7 +392,7 @@ func TestAccKubernetesDeployment_with_container_liveness_probe_using_http_get(t
 	var conf appsv1.Deployment
 
 	deploymentName := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -422,7 +422,7 @@ func TestAccKubernetesDeployment_with_container_liveness_probe_using_tcp(t *test
 	var conf appsv1.Deployment
 
 	deploymentName := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -1845,7 +1845,7 @@ func testAccKubernetesDeploymentConfigWithLivenessProbeUsingHTTPGet(deploymentNa
         container {
           image = "%s"
           name  = "containername"
-          args  = ["/server"]
+          args  = ["liveness"]
 
           liveness_probe {
             http_get {
@@ -1897,7 +1897,7 @@ func testAccKubernetesDeploymentConfigWithLivenessProbeUsingTCP(deploymentName,
         container {
           image = "%s"
           name  = "containername"
-          args  = ["/server"]
+          args  = ["liveness"]
 
           liveness_probe {
             tcp_socket {
@@ -2006,9 +2006,9 @@ func testAccKubernetesDeploymentConfigWithContainerSecurityContext(deploymentNam
         }
 
         container {
-          image = "gcr.io/google_containers/liveness"
+          image = "registry.k8s.io/e2e-test-images/agnhost:2.40"
           name  = "containername2"
-          args  = ["/server"]
+          args  = ["liveness"]
 
           security_context {
             allow_privilege_escalation = true

diff --git a/kubernetes/resource_kubernetes_pod_test.go b/kubernetes/resource_kubernetes_pod_test.go
@@ -536,7 +536,7 @@ func TestAccKubernetesPod_with_container_liveness_probe_using_http_get(t *testin
 	var conf api.Pod
 
 	podName := acctest.RandomWithPrefix("tf-acc-test")
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 	resourceName := "kubernetes_pod.test"
 
 	resource.Test(t, resource.TestCase{
@@ -573,7 +573,7 @@ func TestAccKubernetesPod_with_container_liveness_probe_using_tcp(t *testing.T)
 	var conf api.Pod
 
 	podName := acctest.RandomWithPrefix("tf-acc-test")
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 	resourceName := "kubernetes_pod.test"
 
 	resource.Test(t, resource.TestCase{
@@ -605,7 +605,7 @@ func TestAccKubernetesPod_with_container_liveness_probe_using_grpc(t *testing.T)
 	var conf api.Pod
 
 	podName := acctest.RandomWithPrefix("tf-acc-test")
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 	resourceName := "kubernetes_pod.test"
 
 	resource.Test(t, resource.TestCase{
@@ -641,7 +641,7 @@ func TestAccKubernetesPod_with_container_lifecycle(t *testing.T) {
 	var conf api.Pod
 
 	podName := acctest.RandomWithPrefix("tf-acc-test")
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 	resourceName := "kubernetes_pod.test"
 
 	resource.Test(t, resource.TestCase{
@@ -1960,7 +1960,7 @@ func testAccKubernetesPodConfigWithLivenessProbeUsingHTTPGet(podName, imageName
     container {
       image = "%s"
       name  = "containername"
-      args  = ["/server"]
+      args  = ["liveness"]
 
       liveness_probe {
         http_get {
@@ -1996,7 +1996,7 @@ func testAccKubernetesPodConfigWithLivenessProbeUsingTCP(podName, imageName stri
     container {
       image = "%s"
       name  = "containername"
-      args  = ["/server"]
+      args  = ["liveness"]
 
       liveness_probe {
         tcp_socket {
@@ -2026,7 +2026,7 @@ func testAccKubernetesPodConfigWithLivenessProbeUsingGRPC(podName, imageName str
     container {
       image = "%s"
       name  = "containername"
-      args  = ["/server"]
+      args  = ["liveness"]
 
       liveness_probe {
         grpc {
@@ -2057,7 +2057,7 @@ func testAccKubernetesPodConfigWithLifeCycle(podName, imageName string) string {
     container {
       image = "%s"
       name  = "containername"
-      args  = ["/server"]
+      args  = ["liveness"]
 
       lifecycle {
         post_start {

diff --git a/kubernetes/resource_kubernetes_replication_controller_test.go b/kubernetes/resource_kubernetes_replication_controller_test.go
@@ -280,7 +280,7 @@ func TestAccKubernetesReplicationController_with_container_liveness_probe_using_
 	var conf api.ReplicationController
 
 	rcName := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -310,7 +310,7 @@ func TestAccKubernetesReplicationController_with_container_liveness_probe_using_
 	var conf api.ReplicationController
 
 	rcName := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -335,7 +335,7 @@ func TestAccKubernetesReplicationController_with_container_lifecycle(t *testing.
 	var conf api.ReplicationController
 
 	rcName := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
-	imageName := "gcr.io/google_containers/liveness"
+	imageName := "registry.k8s.io/e2e-test-images/agnhost:2.40"
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -917,7 +917,7 @@ func testAccKubernetesReplicationControllerConfigWithLivenessProbeUsingHTTPGet(r
         container {
           image = "%s"
           name  = "containername"
-          args  = ["/server"]
+          args  = ["liveness"]
 
           liveness_probe {
             http_get {
@@ -967,7 +967,7 @@ func testAccKubernetesReplicationControllerConfigWithLivenessProbeUsingTCP(rcNam
         container {
           image = "%s"
           name  = "containername"
-          args  = ["/server"]
+          args  = ["liveness"]
 
           liveness_probe {
             tcp_socket {
@@ -1011,7 +1011,7 @@ func testAccKubernetesReplicationControllerConfigWithLifeCycle(rcName, imageName
         container {
           image = "%s"
           name  = "containername"
-          args  = ["/server"]
+          args  = ["liveness"]
 
           lifecycle {
             post_start {