Add container name parameter to k8s log api explicitly (#4964)

Co-authored-by: jiang.pengcheng <[email protected]>
apache · Sep 29, 2020 · 259186e · 259186e
1 parent 2fe4ec8
commit 259186e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.../src/main/scala/org/apache/openwhisk/core/containerpool/kubernetes/KubernetesClient.scala b/.../src/main/scala/org/apache/openwhisk/core/containerpool/kubernetes/KubernetesClient.scala
@@ -397,6 +397,8 @@ object KubernetesRestLogSourceStage {
 
   val retryDelay = 100.milliseconds
 
+  val actionContainerName = "user-action"
+
   sealed trait K8SRestLogTimingEvent
 
   case object K8SRestLogRetry extends K8SRestLogTimingEvent
@@ -408,7 +410,8 @@ object KubernetesRestLogSourceStage {
 
     val sinceTimestamp = sinceTime.flatMap(time => formatK8STimestamp(time).toOption)
 
-    Query(Map("timestamps" -> "true") ++ sinceTimestamp.map(time => "sinceTime" -> time))
+    Query(Map("timestamps" -> "true", "container" -> actionContainerName) ++ sinceTimestamp.map(time =>
+      "sinceTime" -> time))
 
   }
 

diff --git a/...r/src/main/scala/org/apache/openwhisk/core/containerpool/kubernetes/WhiskPodBuilder.scala b/...r/src/main/scala/org/apache/openwhisk/core/containerpool/kubernetes/WhiskPodBuilder.scala
@@ -40,7 +40,7 @@ import scala.collection.JavaConverters._
 
 class WhiskPodBuilder(client: NamespacedKubernetesClient, config: KubernetesClientConfig) {
   private val template = config.podTemplate.map(_.value.getBytes(UTF_8))
-  private val actionContainerName = "user-action"
+  private val actionContainerName = KubernetesRestLogSourceStage.actionContainerName
   private val actionContainerPredicate: Predicate[ContainerBuilder] = (cb) => cb.getName == actionContainerName
 
   def affinityEnabled: Boolean = config.userPodNodeAffinity.enabled
@@ -119,7 +119,7 @@ class WhiskPodBuilder(client: NamespacedKubernetesClient, config: KubernetesClie
       .withLimits((Map("memory" -> new Quantity(memory.toMB + "Mi")) ++ cpu ++ diskLimit).asJava)
       .withRequests((Map("memory" -> new Quantity(memory.toMB + "Mi")) ++ cpu ++ diskLimit).asJava)
       .endResources()
-      .withName("user-action")
+      .withName(actionContainerName)
       .withImage(image)
       .withEnv(envVars.asJava)
       .addNewPort()