Skip to content
This repository has been archived by the owner on Sep 24, 2021. It is now read-only.

Commit

Permalink
Merge pull request #144 from heartlock/add-logpath
Browse files Browse the repository at this point in the history 
Add logpath in container status
  • Loading branch information
@feiskyer
feiskyer authored May 16, 2017
2 parents b7548a6 + 2be837c commit eeadbe2
Show file tree
Hide file tree
Showing 70 changed files with 2,072 additions and 1,609 deletions.
519 changes: 262 additions & 257 deletions Godeps/Godeps.json
View file

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions pkg/hyper/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/golang/glog"

"k8s.io/frakti/pkg/hyper/types"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
)

const (
Expand Down Expand Up @@ -60,6 +60,11 @@ func buildUserContainer(config *kubeapi.ContainerConfig, sandboxConfig *kubeapi.
return nil, fmt.Errorf("Privileged containers are not supported in hyper")
}

logPath := filepath.Join(sandboxConfig.LogDirectory, config.LogPath)
if config.Labels == nil {
config.Labels = make(map[string]string)
}
config.Labels[containerLogPathLabelKey] = logPath
containerSpec := &types.UserContainer{
Name: buildContainerName(sandboxConfig, config),
Image: config.GetImage().Image,
Expand All @@ -68,7 +73,7 @@ func buildUserContainer(config *kubeapi.ContainerConfig, sandboxConfig *kubeapi.
Command: config.Args,
Entrypoint: config.Command,
Labels: buildLabelsWithAnnotations(config.Labels, config.Annotations),
LogPath: filepath.Join(sandboxConfig.LogDirectory, config.LogPath),
LogPath: logPath,
}

// make volumes
Expand Down Expand Up @@ -225,6 +230,7 @@ func (h *Runtime) ContainerStatus(containerID string) (*kubeapi.ContainerStatus,
return nil, err
}

logPath := status.Container.Labels[containerLogPathLabelKey]
state := toKubeContainerState(status.Status.Phase)
annotations := getAnnotationsFromLabels(status.Container.Labels)
kubeletLabels := getKubeletLabels(status.Container.Labels)
Expand All @@ -250,6 +256,7 @@ func (h *Runtime) ContainerStatus(containerID string) (*kubeapi.ContainerStatus,
Labels: kubeletLabels,
Annotations: annotations,
CreatedAt: createdAtNano,
LogPath: logPath,
}

mounts := make([]*kubeapi.Mount, len(status.Container.VolumeMounts))
Expand Down
5 changes: 4 additions & 1 deletion pkg/hyper/helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
libcontainercgroups "github.com/opencontainers/runc/libcontainer/cgroups"
"golang.org/x/net/context"
"k8s.io/frakti/pkg/hyper/types"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
)

const (
Expand All @@ -43,6 +43,8 @@ const (
// fraktiAnnotationLabel is used to save annotations into labels
fraktiAnnotationLabel = "io.kubernetes.frakti.annotations"

containerLogPathLabelKey = "io.kubernetes.container.logpath"

// default resources while the pod level qos of kubelet pod is not specified.
defaultCPUNumber = 1
defaultMemoryinMegabytes = 64
Expand Down Expand Up @@ -226,6 +228,7 @@ func toPodSandboxState(state string) kubeapi.PodSandboxState {
//getKubeletLabels gets kubelet labels from labels.
func getKubeletLabels(lables map[string]string) map[string]string {
delete(lables, fraktiAnnotationLabel)
delete(lables, containerLogPathLabelKey)
return lables
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/hyper/helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package hyper
import (
"testing"

kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
)

func TestBuildSandboxName(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/hyper/hyper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/golang/glog"

"k8s.io/frakti/pkg/hyper/ocicni"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/server/streaming"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/hyper/images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"strings"

"github.com/golang/glog"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
)

// ListImages lists existing images.
Expand Down
2 changes: 1 addition & 1 deletion pkg/hyper/sandbox.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"golang.org/x/sys/unix"
"k8s.io/frakti/pkg/hyper/types"
"k8s.io/kubernetes/pkg/api/v1"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
)

// RunPodSandbox creates and starts a pod-level sandbox.
Expand Down
2 changes: 1 addition & 1 deletion pkg/hyper/streaming.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/golang/glog"
"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/server/streaming"
"k8s.io/kubernetes/pkg/kubelet/util/ioutils"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/frakti/pkg/alternativeruntime"
"k8s.io/frakti/pkg/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/server/streaming"
utilexec "k8s.io/kubernetes/pkg/util/exec"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/runtime.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package runtime
import (
"time"

kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
)

// RuntimeService interface should be implemented by a container runtime.
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/cni.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package e2e

import (
"k8s.io/frakti/test/e2e/framework"
internalapi "k8s.io/kubernetes/pkg/kubelet/api"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/containers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"time"

"k8s.io/frakti/test/e2e/framework"
internalapi "k8s.io/kubernetes/pkg/kubelet/api"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/framework.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package framework

import (
internalapi "k8s.io/kubernetes/pkg/kubelet/api"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"sync"
"time"

internalapi "k8s.io/kubernetes/pkg/kubelet/api"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
"k8s.io/kubernetes/pkg/kubelet/remote"

. "github.com/onsi/ginkgo"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/images.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"

"k8s.io/frakti/test/e2e/framework"
internalapi "k8s.io/kubernetes/pkg/kubelet/api"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/pods.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package e2e

import (
"k8s.io/frakti/test/e2e/framework"
internalapi "k8s.io/kubernetes/pkg/kubelet/api"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/streaming.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"time"

"k8s.io/frakti/test/e2e/framework"
internalapi "k8s.io/kubernetes/pkg/kubelet/api"
kubeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
kubeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"github.com/docker/docker/pkg/jsonlog"
"k8s.io/frakti/test/e2e/framework"
internalapi "k8s.io/kubernetes/pkg/kubelet/api"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
internalapi "k8s.io/kubernetes/pkg/kubelet/apis/cri"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 2 additions & 0 deletions vendor/k8s.io/kubernetes/pkg/api/service/BUILD
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 8 additions & 14 deletions vendor/k8s.io/kubernetes/pkg/api/service/annotations.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

97 changes: 68 additions & 29 deletions vendor/k8s.io/kubernetes/pkg/api/service/util.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit eeadbe2

Please sign in to comment.