Make pod log handling compatible with k8s 1.11

Mirantis · Jul 19, 2018 · 4b5e222 · 4b5e222
1 parent 7724a0a
commit 4b5e222
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/pkg/manager/TestCRIMounts.out.yaml b/pkg/manager/TestCRIMounts.out.yaml
@@ -220,7 +220,7 @@
  io.kubernetes.pod.name: testName_0
  io.kubernetes.pod.namespace: default
  io.kubernetes.pod.uid: 69eec606-0493-5825-73a4-c5e0c0236155
- log_path: container-for-testName_0_0.log
+ log_path: /var/log/test_log_directory/container-for-testName_0_0.log
  metadata:
  name: container-for-testName_0
  mounts:

diff --git a/pkg/manager/TestCRIPods.out.yaml b/pkg/manager/TestCRIPods.out.yaml
@@ -250,7 +250,7 @@
  io.kubernetes.pod.name: testName_0
  io.kubernetes.pod.namespace: default
  io.kubernetes.pod.uid: 69eec606-0493-5825-73a4-c5e0c0236155
- log_path: container-for-testName_0_0.log
+ log_path: /var/log/test_log_directory/container-for-testName_0_0.log
  metadata:
  name: container-for-testName_0
 - name: 'enter: StartContainer'
@@ -296,7 +296,7 @@
  io.kubernetes.pod.name: testName_0
  io.kubernetes.pod.namespace: default
  io.kubernetes.pod.uid: 69eec606-0493-5825-73a4-c5e0c0236155
- log_path: container-for-testName_0_0.log
+ log_path: /var/log/test_log_directory/container-for-testName_0_0.log
  metadata:
  name: container-for-testName_0
  started_at: 1524648266720331175
@@ -541,7 +541,7 @@
  io.kubernetes.pod.name: testName_1
  io.kubernetes.pod.namespace: default
  io.kubernetes.pod.uid: d25ded14-d35d-510b-5749-f83cc165794e
- log_path: container-for-testName_1_0.log
+ log_path: /var/log/test_log_directory/container-for-testName_1_0.log
  metadata:
  name: container-for-testName_1
 - name: 'enter: StartContainer'
@@ -587,7 +587,7 @@
  io.kubernetes.pod.name: testName_1
  io.kubernetes.pod.namespace: default
  io.kubernetes.pod.uid: d25ded14-d35d-510b-5749-f83cc165794e
- log_path: container-for-testName_1_0.log
+ log_path: /var/log/test_log_directory/container-for-testName_1_0.log
  metadata:
  name: container-for-testName_1
  started_at: 1524648266720331175
@@ -675,7 +675,7 @@
  io.kubernetes.pod.name: testName_0
  io.kubernetes.pod.namespace: default
  io.kubernetes.pod.uid: 69eec606-0493-5825-73a4-c5e0c0236155
- log_path: container-for-testName_0_0.log
+ log_path: /var/log/test_log_directory/container-for-testName_0_0.log
  metadata:
  name: container-for-testName_0
  started_at: 1524648266720331175

diff --git a/pkg/manager/cri.go b/pkg/manager/cri.go
@@ -19,6 +19,7 @@ package manager
 import (
  "errors"
  "fmt"
+ "path/filepath"
 
  kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
 
@@ -227,7 +228,7 @@ func ContainerInfoToCRIContainerStatus(in *types.ContainerInfo) *kubeapi.Contain
  Labels: in.Config.ContainerLabels,
  Annotations: in.Config.ContainerAnnotations,
  Mounts: mounts,
- LogPath: in.Config.LogPath,
+ LogPath: filepath.Join(in.Config.LogDirectory, in.Config.LogPath),
  // TODO: FinishedAt, Reason, Message
  }
 }