k8s/debug: also mount nginx dir on debug container

tsuru · Aug 29, 2023 · 15c7ff3 · 15c7ff3
1 parent a625520
commit 15c7ff3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/internal/pkg/rpaas/k8s.go b/internal/pkg/rpaas/k8s.go
@@ -216,6 +216,13 @@ func (m *k8sRpaasManager) generateDebugContainer(ctx context.Context, args *Debu
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			Stdin:           args.Stdin != nil,
 			TTY:             args.TTY,
+			VolumeMounts: []corev1.VolumeMount{
+				{
+					Name:      "nginx-config",
+					MountPath: "/etc/nginx",
+					ReadOnly:  true,
+				},
+			},
 		}, TargetContainerName: args.Container,
 	}
 	instancePodWithDebug := instancePod.DeepCopy()

diff --git a/internal/pkg/rpaas/k8s_test.go b/internal/pkg/rpaas/k8s_test.go
@@ -4906,7 +4906,13 @@ func Test_k8sRpaasManager_Debug(t *testing.T) {
 				instancePod := corev1.Pod{}
 				err = m.cli.Get(context.Background(), types.NamespacedName{Name: "pod1", Namespace: instance2.Namespace}, &instancePod)
 				require.NoError(t, err)
-				expectedEphemerals := []corev1.EphemeralContainer{{EphemeralContainerCommon: corev1.EphemeralContainerCommon{Name: "debugger-1", Image: "tsuru/debug-image", ImagePullPolicy: corev1.PullIfNotPresent, Stdin: true}, TargetContainerName: "nginx"}}
+				expectedEphemerals := []corev1.EphemeralContainer{{EphemeralContainerCommon: corev1.EphemeralContainerCommon{
+					Name:            "debugger-1",
+					Image:           "tsuru/debug-image",
+					ImagePullPolicy: corev1.PullIfNotPresent,
+					Stdin:           true,
+					VolumeMounts:    []corev1.VolumeMount{{Name: "nginx-config", MountPath: "/etc/nginx", ReadOnly: true}},
+				}, TargetContainerName: "nginx"}}
 				assert.Equal(t, expectedEphemerals, instancePod.Spec.EphemeralContainers)
 			},
 		},
@@ -4927,7 +4933,13 @@ func Test_k8sRpaasManager_Debug(t *testing.T) {
 				instancePod := corev1.Pod{}
 				err = m.cli.Get(context.Background(), types.NamespacedName{Name: "pod1", Namespace: instance2.Namespace}, &instancePod)
 				require.NoError(t, err)
-				expectedEphemerals := []corev1.EphemeralContainer{{EphemeralContainerCommon: corev1.EphemeralContainerCommon{Name: "debugger-2", Image: "tsuru/debug-image", ImagePullPolicy: corev1.PullIfNotPresent, Stdin: true}, TargetContainerName: "nginx"}}
+				expectedEphemerals := []corev1.EphemeralContainer{{EphemeralContainerCommon: corev1.EphemeralContainerCommon{
+					Name:            "debugger-2",
+					Image:           "tsuru/debug-image",
+					ImagePullPolicy: corev1.PullIfNotPresent,
+					Stdin:           true,
+					VolumeMounts:    []corev1.VolumeMount{{Name: "nginx-config", MountPath: "/etc/nginx", ReadOnly: true}},
+				}, TargetContainerName: "nginx"}}
 				assert.Equal(t, expectedEphemerals, instancePod.Spec.EphemeralContainers)
 			},
 		},