add container file system usage

Mirantis · Oct 29, 2024 · 7488e09 · 7488e09
1 parent 2bd8a6e
commit 7488e09
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/core/imagefs_linux.go b/core/imagefs_linux.go
@@ -76,7 +76,16 @@ func (ds *dockerService) imageFsInfo() (*runtimeapi.ImageFsInfoResponse, error)
 				InodesUsed: &runtimeapi.UInt64Value{
 					Value: iNodesUsed,
 				},
-			},
-		},
+			}},
+		ContainerFilesystems: []*runtimeapi.FilesystemUsage{
+			{
+				Timestamp: time.Now().UnixNano(),
+				FsId: &runtimeapi.FilesystemIdentifier{
+					Mountpoint: ds.dockerRootDir,
+				},
+				UsedBytes: &runtimeapi.UInt64Value{
+					Value: ds.containerStatsCache.getWriteableLayer(),
+				},
+			}},
 	}, nil
 }
diff --git a/core/stats.go b/core/stats.go
@@ -115,6 +115,17 @@ func (cs *cstats) getContainerRWSize() uint64 {
 	return cs.rwLayerSize
 }
 
+func (c *containerStatsCache) getWriteableLayer() uint64 {
+	c.RLock()
+	defer c.RUnlock()
+
+	var totalLayerSize uint64
+	for _, stat := range c.stats {
+		totalLayerSize += stat.rwLayerSize
+	}
+	return totalLayerSize
+}
+
 func (c *containerStatsCache) getStats(containerID string) *cstats {
 	c.RLock()
 	defer c.RUnlock()

diff --git a/network/hostport/hostport_manager.go b/network/hostport/hostport_manager.go
@@ -32,7 +32,7 @@ import (
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/kubernetes/pkg/util/conntrack"
+	"k8s.io/kubernetes/pkg/proxy/conntrack"
 	utiliptables "k8s.io/kubernetes/pkg/util/iptables"
 	"k8s.io/utils/exec"
 	utilnet "k8s.io/utils/net"

diff --git a/streaming/server.go b/streaming/server.go
@@ -36,8 +36,8 @@ import (
 	remotecommandconsts "k8s.io/apimachinery/pkg/util/remotecommand"
 	"k8s.io/client-go/tools/remotecommand"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	"k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
-	remotecommandserver "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand"
+	"k8s.io/kubelet/pkg/cri/streaming/portforward"
+	remotecommandserver "k8s.io/kubelet/pkg/cri/streaming/remotecommand"
 )
 
 // Server is the library interface to serve the stream requests.

diff --git a/streaming/server_test.go b/streaming/server_test.go
@@ -36,7 +36,7 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/transport/spdy"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
-	kubeletportforward "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward"
+	kubeletportforward "k8s.io/kubelet/pkg/cri/streaming/portforward"
 )
 
 const (

diff --git a/streaming/streaming.go b/streaming/streaming.go
@@ -28,7 +28,7 @@ import (
 
 	dockertypes "github.com/docker/docker/api/types"
 
-	"k8s.io/kubernetes/pkg/kubelet/cri/streaming"
+	"k8s.io/kubelet/pkg/cri/streaming"
 
 	"github.com/Mirantis/cri-dockerd/libdocker"
 )