Skip to content

Commit

Permalink
Merge pull request #3565 from uablrek/revert-crio-systemd
Browse files Browse the repository at this point in the history
Revert "reduce_logs_for_kubelet_use_crio"
  • Loading branch information
iwankgb authored Jul 13, 2024
2 parents c9375fe + ca820b6 commit 256737f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 26 deletions.
14 changes: 3 additions & 11 deletions container/crio/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ import (
// The namespace under which crio aliases are unique.
const CrioNamespace = "crio"

// The namespace suffix under which crio aliases are unique.
const CrioNamespaceSuffix = ".scope"

// The namespace systemd runs components under.
const SystemdNamespace = "system-systemd"

Expand Down Expand Up @@ -117,21 +114,16 @@ func (f *crioFactory) CanHandleAndAccept(name string) (bool, bool, error) {
// TODO(runcom): should we include crio-conmon cgroups?
return false, false, nil
}
if strings.HasPrefix(path.Base(name), SystemdNamespace) {
return true, false, nil
}
if !strings.HasPrefix(path.Base(name), CrioNamespace) {
return false, false, nil
}
if strings.HasPrefix(path.Base(name), SystemdNamespace) {
return true, false, nil
}
// if the container is not associated with CRI-O, we can't handle it or accept it.
if !isContainerName(name) {
return false, false, nil
}

if !strings.HasSuffix(path.Base(name), CrioNamespaceSuffix) {
// this mean it's a sandbox container
return true, false, nil
}
return true, true, nil
}

Expand Down
23 changes: 8 additions & 15 deletions container/crio/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ import (
"github.com/stretchr/testify/assert"
)

type canHandleAndAccept struct {
canHandle bool
canAccept bool
}

func TestCanHandleAndAccept(t *testing.T) {
as := assert.New(t)
f := &crioFactory{
Expand All @@ -36,18 +31,16 @@ func TestCanHandleAndAccept(t *testing.T) {
storageDir: "",
includedMetrics: nil,
}
for k, v := range map[string]canHandleAndAccept{
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f": {true, false},
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f.scope": {true, true},
"/system.slice/system-systemd\\\\x2dcoredump.slice": {true, false},
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f.mount": {false, false},
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-conmon-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f": {false, false},
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/no-crio-conmon-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f": {false, false},
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75": {false, false},
for k, v := range map[string]bool{
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f": true,
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f.mount": false,
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-conmon-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f": false,
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/no-crio-conmon-81e5c2990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75d5f": false,
"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/crio-990803c383229c9680ce964738d5e566d97f5bd436ac34808d2ec75": false,
} {
b1, b2, err := f.CanHandleAndAccept(k)
as.Nil(err)
as.Equal(b1, v.canHandle)
as.Equal(b2, v.canAccept)
as.Equal(b1, v)
as.Equal(b2, v)
}
}

0 comments on commit 256737f

Please sign in to comment.