Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / bcae658f9530e95cde2ac931beacae71c9fb240e / . / third_party / go / patches / k8s-use-native.patch
blob: 61001dae1230627e180971899161f9761aaeef14 [file] [log] [blame]
Lorenz Brun878f5f92020-05-12 16:15:39 +0200[diff] [blame]1Copyright 2020 The Monogon Project Authors.
2
3Licensed under the Apache License, Version 2.0 (the "License");
4you may not use this file except in compliance with the License.
5You may obtain a copy of the License at
6
7 http://www.apache.org/licenses/LICENSE-2.0
8
9Unless required by applicable law or agreed to in writing, software
10distributed under the License is distributed on an "AS IS" BASIS,
11WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12See the License for the specific language governing permissions and
13limitations under the License.
14
15
16From ee4a7df588550ee5cbc3b8419e1ce185a8abb302 Mon Sep 17 00:00:00 2001
17From: Lorenz Brun <lorenz@brun.one>
18Date: Tue, 17 Mar 2020 22:07:24 +0100
19Subject: [PATCH 3/3] Use StatFS and Native volume metrics instead of du
20
21---
22 pkg/kubelet/stats/log_metrics_provider.go | 2 +-
23 pkg/volume/configmap/configmap.go | 4 ++--
24 pkg/volume/downwardapi/downwardapi.go | 4 ++--
25 pkg/volume/emptydir/empty_dir.go | 4 ++--
26 pkg/volume/projected/projected.go | 4 ++--
27 pkg/volume/secret/secret.go | 4 ++--
28 6 files changed, 11 insertions(+), 11 deletions(-)
29
30diff --git a/pkg/kubelet/stats/log_metrics_provider.go b/pkg/kubelet/stats/log_metrics_provider.go
31index 4a53eef74a3..ff87fec5ec3 100644
32--- a/pkg/kubelet/stats/log_metrics_provider.go
33+++ b/pkg/kubelet/stats/log_metrics_provider.go
34@@ -33,5 +33,5 @@ func NewLogMetricsService() LogMetricsService {
35 }
36
37 func (l logMetrics) createLogMetricsProvider(path string) volume.MetricsProvider {
38- return volume.NewMetricsDu(path)
39+ return volume.NewMetricsNative(path)
40 }
41diff --git a/pkg/volume/configmap/configmap.go b/pkg/volume/configmap/configmap.go
42index 0e74dd0a1d8..430d739aab7 100644
43--- a/pkg/volume/configmap/configmap.go
44+++ b/pkg/volume/configmap/configmap.go
45@@ -97,7 +97,7 @@ func (plugin *configMapPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, opts v
46 pod.UID,
47 plugin,
48 plugin.host.GetMounter(plugin.GetPluginName()),
49- volume.NewCachedMetrics(volume.NewMetricsDu(getPath(pod.UID, spec.Name(), plugin.host))),
50+ volume.NewCachedMetrics(volume.NewMetricsNative(getPath(pod.UID, spec.Name(), plugin.host))),
51 },
52 source: *spec.Volume.ConfigMap,
53 pod: *pod,
54@@ -113,7 +113,7 @@ func (plugin *configMapPlugin) NewUnmounter(volName string, podUID types.UID) (v
55 podUID,
56 plugin,
57 plugin.host.GetMounter(plugin.GetPluginName()),
58- volume.NewCachedMetrics(volume.NewMetricsDu(getPath(podUID, volName, plugin.host))),
59+ volume.NewCachedMetrics(volume.NewMetricsNative(getPath(podUID, volName, plugin.host))),
60 },
61 }, nil
62 }
63diff --git a/pkg/volume/downwardapi/downwardapi.go b/pkg/volume/downwardapi/downwardapi.go
64index a1779c0dac9..f0a0f99b318 100644
65--- a/pkg/volume/downwardapi/downwardapi.go
66+++ b/pkg/volume/downwardapi/downwardapi.go
67@@ -99,7 +99,7 @@ func (plugin *downwardAPIPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, opts
68 pod: pod,
69 podUID: pod.UID,
70 plugin: plugin,
71- MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsDu(getPath(pod.UID, spec.Name(), plugin.host))),
72+ MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsStatFS(getPath(pod.UID, spec.Name(), plugin.host))),
73 }
74 return &downwardAPIVolumeMounter{
75 downwardAPIVolume: v,
76@@ -114,7 +114,7 @@ func (plugin *downwardAPIPlugin) NewUnmounter(volName string, podUID types.UID)
77 volName: volName,
78 podUID: podUID,
79 plugin: plugin,
80- MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsDu(getPath(podUID, volName, plugin.host))),
81+ MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsStatFS(getPath(podUID, volName, plugin.host))),
82 },
83 }, nil
84 }
85diff --git a/pkg/volume/emptydir/empty_dir.go b/pkg/volume/emptydir/empty_dir.go
86index 0a25d2b684c..5dc83b90c5b 100644
87--- a/pkg/volume/emptydir/empty_dir.go
88+++ b/pkg/volume/emptydir/empty_dir.go
89@@ -121,7 +121,7 @@ func (plugin *emptyDirPlugin) newMounterInternal(spec *volume.Spec, pod *v1.Pod,
90 mounter: mounter,
91 mountDetector: mountDetector,
92 plugin: plugin,
93- MetricsProvider: volume.NewMetricsDu(getPath(pod.UID, spec.Name(), plugin.host)),
94+ MetricsProvider: volume.NewMetricsNative(getPath(pod.UID, spec.Name(), plugin.host)),
95 }, nil
96 }
97
98@@ -138,7 +138,7 @@ func (plugin *emptyDirPlugin) newUnmounterInternal(volName string, podUID types.
99 mounter: mounter,
100 mountDetector: mountDetector,
101 plugin: plugin,
102- MetricsProvider: volume.NewMetricsDu(getPath(podUID, volName, plugin.host)),
103+ MetricsProvider: volume.NewMetricsNative(getPath(podUID, volName, plugin.host)),
104 }
105 return ed, nil
106 }
107diff --git a/pkg/volume/projected/projected.go b/pkg/volume/projected/projected.go
108index 0f65a97610c..890f9c1c7bc 100644
109--- a/pkg/volume/projected/projected.go
110+++ b/pkg/volume/projected/projected.go
111@@ -114,7 +114,7 @@ func (plugin *projectedPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, opts v
112 sources: spec.Volume.Projected.Sources,
113 podUID: pod.UID,
114 plugin: plugin,
115- MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsDu(getPath(pod.UID, spec.Name(), plugin.host))),
116+ MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsStatFS(getPath(pod.UID, spec.Name(), plugin.host))),
117 },
118 source: *spec.Volume.Projected,
119 pod: pod,
120@@ -128,7 +128,7 @@ func (plugin *projectedPlugin) NewUnmounter(volName string, podUID types.UID) (v
121 volName: volName,
122 podUID: podUID,
123 plugin: plugin,
124- MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsDu(getPath(podUID, volName, plugin.host))),
125+ MetricsProvider: volume.NewCachedMetrics(volume.NewMetricsStatFS(getPath(podUID, volName, plugin.host))),
126 },
127 }, nil
128 }
129diff --git a/pkg/volume/secret/secret.go b/pkg/volume/secret/secret.go
130index a195c59ddd8..4c290cb8f24 100644
131--- a/pkg/volume/secret/secret.go
132+++ b/pkg/volume/secret/secret.go
133@@ -100,7 +100,7 @@ func (plugin *secretPlugin) NewMounter(spec *volume.Spec, pod *v1.Pod, opts volu
134 pod.UID,
135 plugin,
136 plugin.host.GetMounter(plugin.GetPluginName()),
137- volume.NewCachedMetrics(volume.NewMetricsDu(getPath(pod.UID, spec.Name(), plugin.host))),
138+ volume.NewCachedMetrics(volume.NewMetricsStatFS(getPath(pod.UID, spec.Name(), plugin.host))),
139 },
140 source: *spec.Volume.Secret,
141 pod: *pod,
142@@ -116,7 +116,7 @@ func (plugin *secretPlugin) NewUnmounter(volName string, podUID types.UID) (volu
143 podUID,
144 plugin,
145 plugin.host.GetMounter(plugin.GetPluginName()),
146- volume.NewCachedMetrics(volume.NewMetricsDu(getPath(podUID, volName, plugin.host))),
147+ volume.NewCachedMetrics(volume.NewMetricsStatFS(getPath(podUID, volName, plugin.host))),
148 },
149 }, nil
150 }
151--
1522.25.1
153