Skip to content

Commit

Permalink
Expose DefaultContainerName (#2479)
Browse files Browse the repository at this point in the history
Co-authored-by: Pavan Navarathna <6504783+pavannd1@users.noreply.github.com>
  • Loading branch information
e-sumin and pavannd1 authored Nov 20, 2023
1 parent 9a62988 commit 327f0c2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pkg/kube/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const (
// PodReadyWaitTimeoutEnv is the env var to get pod ready wait timeout
PodReadyWaitTimeoutEnv = "KANISTER_POD_READY_WAIT_TIMEOUT"
errAccessingNode = "Failed to get node"
defaultContainerName = "container"
DefaultContainerName = "container"
redactedValue = "XXXXX"
)

Expand Down Expand Up @@ -205,7 +205,7 @@ func GetPodObjectFromPodOptions(ctx context.Context, cli kubernetes.Interface, o
// name. This should be used whenever we create pods for Kanister functions.
func ContainerNameFromPodOptsOrDefault(po *PodOptions) string {
if po == nil || po.ContainerName == "" {
return defaultContainerName
return DefaultContainerName
}

return po.ContainerName
Expand Down
8 changes: 4 additions & 4 deletions pkg/kube/pod_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func (s *PodSuite) TestPod(c *C) {
case po.ContainerName != "":
c.Assert(pod.Spec.Containers[0].Name, Equals, po.ContainerName)
default:
c.Assert(pod.Spec.Containers[0].Name, Equals, defaultContainerName)
c.Assert(pod.Spec.Containers[0].Name, Equals, DefaultContainerName)
}

switch {
Expand Down Expand Up @@ -1063,7 +1063,7 @@ func (s *PodControllerTestSuite) TestContainerNameFromPodOptsOrDefault(c *C) {
},
{
podOptsContainerName: "",
expectedContainerName: defaultContainerName,
expectedContainerName: DefaultContainerName,
},
} {
name := ContainerNameFromPodOptsOrDefault(&PodOptions{
Expand All @@ -1073,8 +1073,8 @@ func (s *PodControllerTestSuite) TestContainerNameFromPodOptsOrDefault(c *C) {
}

name := ContainerNameFromPodOptsOrDefault(&PodOptions{})
c.Assert(name, Equals, defaultContainerName)
c.Assert(name, Equals, DefaultContainerName)

name = ContainerNameFromPodOptsOrDefault(nil)
c.Assert(name, Equals, defaultContainerName)
c.Assert(name, Equals, DefaultContainerName)
}

0 comments on commit 327f0c2

Please sign in to comment.