Skip to content

Commit ecfff8c

Browse files
saschagrunertsaschagrunert
committed
Remove gogo-protobuf from CRI
Signed-off-by: Sascha Grunert <[email protected]>
1 parent 09e5e62 commit ecfff8c

File tree

14 files changed

+11984
-44973
lines changed

14 files changed

+11984
-44973
lines changed

‎pkg/kubelet/kuberuntime/kuberuntime_image.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func (m *kubeGenericRuntimeManager) GetImageSize(ctx context.Context, image kube
105105
if resp.Image == nil {
106106
return 0, nil
107107
}
108-
return resp.Image.Size_, nil
108+
return resp.Image.GetSize(), nil
109109
}
110110

111111
// ListImages gets all images currently on the machine.
@@ -132,7 +132,7 @@ func (m *kubeGenericRuntimeManager) ListImages(ctx context.Context) ([]kubeconta
132132

133133
images = append(images, kubecontainer.Image{
134134
ID: img.Id,
135-
Size: int64(img.Size_),
135+
Size: int64(img.GetSize()),
136136
RepoTags: img.RepoTags,
137137
RepoDigests: img.RepoDigests,
138138
Spec: toKubeContainerImageSpec(img),
@@ -166,7 +166,7 @@ func (m *kubeGenericRuntimeManager) ImageStats(ctx context.Context) (*kubecontai
166166
}
167167
stats := &kubecontainer.ImageStats{}
168168
for _, img := range allImages {
169-
stats.TotalStorageBytes += img.Size_
169+
stats.TotalStorageBytes += img.GetSize()
170170
}
171171
return stats, nil
172172
}

‎pkg/kubelet/stats/cri_stats_provider.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func (p *criStatsProvider) listPodStatsPartiallyFromCRI(ctx context.Context, upd
160160
// fsIDtoInfo is a map from filesystem id to its stats. This will be used
161161
// as a cache to avoid querying cAdvisor for the filesystem stats with the
162162
// same filesystem id many times.
163-
fsIDtoInfo := make(map[runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo)
163+
fsIDtoInfo := make(map[*runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo)
164164

165165
// sandboxIDToPodStats is a temporary map from sandbox ID to its pod stats.
166166
sandboxIDToPodStats := make(map[string]*statsapi.PodStats)
@@ -241,7 +241,7 @@ func (p *criStatsProvider) listPodStatsStrictlyFromCRI(ctx context.Context, upda
241241
return nil, err
242242
}
243243

244-
fsIDtoInfo := make(map[runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo)
244+
fsIDtoInfo := make(map[*runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo)
245245
summarySandboxStats := make([]statsapi.PodStats, 0, len(podSandboxMap))
246246
for _, criSandboxStat := range criSandboxStats {
247247
if criSandboxStat == nil || criSandboxStat.Attributes == nil {
@@ -596,7 +596,7 @@ func (p *criStatsProvider) makeContainerStats(
596596
stats *runtimeapi.ContainerStats,
597597
container *runtimeapi.Container,
598598
rootFsInfo *cadvisorapiv2.FsInfo,
599-
fsIDtoInfo map[runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
599+
fsIDtoInfo map[*runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
600600
meta *runtimeapi.PodSandboxMetadata,
601601
updateCPUNanoCoreUsage bool,
602602
) (*statsapi.ContainerStats, error) {
@@ -663,13 +663,13 @@ func (p *criStatsProvider) makeContainerStats(
663663
fsID := stats.GetWritableLayer().GetFsId()
664664
var err error
665665
if fsID != nil {
666-
imageFsInfo, found := fsIDtoInfo[*fsID]
666+
imageFsInfo, found := fsIDtoInfo[fsID]
667667
if !found {
668668
imageFsInfo, err = p.getFsInfo(fsID)
669669
if err != nil {
670670
return nil, fmt.Errorf("get filesystem info: %w", err)
671671
}
672-
fsIDtoInfo[*fsID] = imageFsInfo
672+
fsIDtoInfo[fsID] = imageFsInfo
673673
}
674674
if imageFsInfo != nil {
675675
// The image filesystem id is unknown to the local node or there's

‎pkg/kubelet/stats/cri_stats_provider_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
)
3131

3232
func (p *criStatsProvider) addCRIPodContainerStats(criSandboxStat *runtimeapi.PodSandboxStats,
33-
ps *statsapi.PodStats, fsIDtoInfo map[runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
33+
ps *statsapi.PodStats, fsIDtoInfo map[*runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
3434
containerMap map[string]*runtimeapi.Container,
3535
podSandbox *runtimeapi.PodSandbox,
3636
rootFsInfo *cadvisorapiv2.FsInfo, updateCPUNanoCoreUsage bool) error {

‎pkg/kubelet/stats/cri_stats_provider_others.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (p *criStatsProvider) listContainerNetworkStats() (map[string]*statsapi.Net
3232
}
3333

3434
func (p *criStatsProvider) addCRIPodContainerStats(criSandboxStat *runtimeapi.PodSandboxStats,
35-
ps *statsapi.PodStats, fsIDtoInfo map[runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
35+
ps *statsapi.PodStats, fsIDtoInfo map[*runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
3636
containerMap map[string]*runtimeapi.Container,
3737
podSandbox *runtimeapi.PodSandbox,
3838
rootFsInfo *cadvisorapiv2.FsInfo, updateCPUNanoCoreUsage bool) error {

‎pkg/kubelet/stats/cri_stats_provider_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (p *criStatsProvider) listContainerNetworkStats() (map[string]*statsapi.Net
8383
}
8484

8585
func (p *criStatsProvider) addCRIPodContainerStats(criSandboxStat *runtimeapi.PodSandboxStats,
86-
ps *statsapi.PodStats, fsIDtoInfo map[runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
86+
ps *statsapi.PodStats, fsIDtoInfo map[*runtimeapi.FilesystemIdentifier]*cadvisorapiv2.FsInfo,
8787
containerMap map[string]*runtimeapi.Container,
8888
podSandbox *runtimeapi.PodSandbox,
8989
rootFsInfo *cadvisorapiv2.FsInfo,

‎staging/src/k8s.io/cri-api/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ go 1.23.0
77
godebug default=go1.23
88

99
require (
10-
github.com/gogo/protobuf v1.3.2
1110
github.com/stretchr/testify v1.9.0
1211
google.golang.org/grpc v1.65.0
12+
google.golang.org/protobuf v1.35.1
1313
)
1414

1515
require (
@@ -21,7 +21,6 @@ require (
2121
golang.org/x/sys v0.26.0 // indirect
2222
golang.org/x/text v0.19.0 // indirect
2323
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
24-
google.golang.org/protobuf v1.35.1 // indirect
2524
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
2625
gopkg.in/yaml.v3 v3.0.1 // indirect
2726
)

‎staging/src/k8s.io/cri-api/go.sum

Lines changed: 0 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)