Skip to content

Commit 06dc8cf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#81996 from hwdef/fix-t/e/i/m
use log functions of core framework
2 parents fad8f53 + 11e0873 commit 06dc8cf

File tree

9 files changed

+64
-73
lines changed

9 files changed

+64
-73
lines changed

‎test/e2e/instrumentation/monitoring/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ go_library(
3838
"//test/e2e/framework:go_default_library",
3939
"//test/e2e/framework/config:go_default_library",
4040
"//test/e2e/framework/gpu:go_default_library",
41-
"//test/e2e/framework/log:go_default_library",
4241
"//test/e2e/framework/metrics:go_default_library",
4342
"//test/e2e/framework/pod:go_default_library",
4443
"//test/e2e/instrumentation/common:go_default_library",

‎test/e2e/instrumentation/monitoring/accelerator.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import (
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
"k8s.io/kubernetes/test/e2e/framework"
3232
"k8s.io/kubernetes/test/e2e/framework/gpu"
33-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3433
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
3534
"k8s.io/kubernetes/test/e2e/scheduling"
3635
"k8s.io/kubernetes/test/utils/image"
@@ -102,7 +101,7 @@ func testStackdriverAcceleratorMonitoring(f *framework.Framework) {
102101
pollingFunction := checkForAcceleratorMetrics(projectID, gcmService, time.Now(), metricsMap)
103102
err = wait.Poll(pollFrequency, pollTimeout, pollingFunction)
104103
if err != nil {
105-
e2elog.Logf("Missing metrics: %+v", metricsMap)
104+
framework.Logf("Missing metrics: %+v", metricsMap)
106105
}
107106
framework.ExpectNoError(err)
108107
}
@@ -120,9 +119,9 @@ func checkForAcceleratorMetrics(projectID string, gcmService *gcm.Service, start
120119
if len(ts) > 0 {
121120
counter = counter + 1
122121
metricsMap[metric] = true
123-
e2elog.Logf("Received %v timeseries for metric %v", len(ts), metric)
122+
framework.Logf("Received %v timeseries for metric %v", len(ts), metric)
124123
} else {
125-
e2elog.Logf("No timeseries for metric %v", metric)
124+
framework.Logf("No timeseries for metric %v", metric)
126125
}
127126
}
128127
if counter < 3 {

‎test/e2e/instrumentation/monitoring/cadvisor.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
clientset "k8s.io/client-go/kubernetes"
2525
"k8s.io/kubernetes/test/e2e/framework"
2626
"k8s.io/kubernetes/test/e2e/framework/config"
27-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2827
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
2928

3029
"github.com/onsi/ginkgo"
@@ -72,8 +71,8 @@ func CheckCadvisorHealthOnAllNodes(c clientset.Interface, timeout time.Duration)
7271
if maxRetries--; maxRetries <= 0 {
7372
break
7473
}
75-
e2elog.Logf("failed to retrieve kubelet stats -\n %v", errors)
74+
framework.Logf("failed to retrieve kubelet stats -\n %v", errors)
7675
time.Sleep(cadvisor.SleepDuration)
7776
}
78-
e2elog.Failf("Failed after retrying %d times for cadvisor to be healthy on all nodes. Errors:\n%v", maxRetries, errors)
77+
framework.Failf("Failed after retrying %d times for cadvisor to be healthy on all nodes. Errors:\n%v", maxRetries, errors)
7978
}

‎test/e2e/instrumentation/monitoring/custom_metrics_deployments.go‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
rbacv1 "k8s.io/api/rbac/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/kubernetes/test/e2e/framework"
30-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3130
imageutils "k8s.io/kubernetes/test/utils/image"
3231
)
3332

@@ -266,20 +265,20 @@ func CreateAdapter(adapterDeploymentFile string) error {
266265
return err
267266
}
268267
stat, err := framework.RunKubectl("create", "-f", adapterURL)
269-
e2elog.Logf(stat)
268+
framework.Logf(stat)
270269
return err
271270
}
272271

273272
func createClusterAdminBinding() error {
274273
stdout, stderr, err := framework.RunCmd("gcloud", "config", "get-value", "core/account")
275274
if err != nil {
276-
e2elog.Logf(stderr)
275+
framework.Logf(stderr)
277276
return err
278277
}
279278
serviceAccount := strings.TrimSpace(stdout)
280-
e2elog.Logf("current service account: %q", serviceAccount)
279+
framework.Logf("current service account: %q", serviceAccount)
281280
stat, err := framework.RunKubectl("create", "clusterrolebinding", ClusterAdminBinding, "--clusterrole=cluster-admin", "--user="+serviceAccount)
282-
e2elog.Logf(stat)
281+
framework.Logf(stat)
283282
return err
284283
}
285284

@@ -308,32 +307,32 @@ func CreateDescriptors(service *gcm.Service, projectID string) error {
308307
func CleanupDescriptors(service *gcm.Service, projectID string) {
309308
_, err := service.Projects.MetricDescriptors.Delete(fmt.Sprintf("projects/%s/metricDescriptors/custom.googleapis.com/%s", projectID, CustomMetricName)).Do()
310309
if err != nil {
311-
e2elog.Logf("Failed to delete descriptor for metric '%s': %v", CustomMetricName, err)
310+
framework.Logf("Failed to delete descriptor for metric '%s': %v", CustomMetricName, err)
312311
}
313312
_, err = service.Projects.MetricDescriptors.Delete(fmt.Sprintf("projects/%s/metricDescriptors/custom.googleapis.com/%s", projectID, UnusedMetricName)).Do()
314313
if err != nil {
315-
e2elog.Logf("Failed to delete descriptor for metric '%s': %v", CustomMetricName, err)
314+
framework.Logf("Failed to delete descriptor for metric '%s': %v", CustomMetricName, err)
316315
}
317316
}
318317

319318
// CleanupAdapter deletes Custom Metrics - Stackdriver adapter deployments.
320319
func CleanupAdapter(adapterDeploymentFile string) {
321320
stat, err := framework.RunKubectl("delete", "-f", adapterDeploymentFile)
322-
e2elog.Logf(stat)
321+
framework.Logf(stat)
323322
if err != nil {
324-
e2elog.Logf("Failed to delete adapter deployments: %s", err)
323+
framework.Logf("Failed to delete adapter deployments: %s", err)
325324
}
326325
err = exec.Command("rm", adapterDeploymentFile).Run()
327326
if err != nil {
328-
e2elog.Logf("Failed to delete adapter deployment file: %s", err)
327+
framework.Logf("Failed to delete adapter deployment file: %s", err)
329328
}
330329
cleanupClusterAdminBinding()
331330
}
332331

333332
func cleanupClusterAdminBinding() {
334333
stat, err := framework.RunKubectl("delete", "clusterrolebinding", ClusterAdminBinding)
335-
e2elog.Logf(stat)
334+
framework.Logf(stat)
336335
if err != nil {
337-
e2elog.Logf("Failed to delete cluster admin binding: %s", err)
336+
framework.Logf("Failed to delete cluster admin binding: %s", err)
338337
}
339338
}

‎test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
cacheddiscovery "k8s.io/client-go/discovery/cached/memory"
3737
"k8s.io/client-go/restmapper"
3838
"k8s.io/kubernetes/test/e2e/framework"
39-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
4039
customclient "k8s.io/metrics/pkg/client/custom_metrics"
4140
externalclient "k8s.io/metrics/pkg/client/external_metrics"
4241
)
@@ -58,7 +57,7 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
5857
kubeClient := f.ClientSet
5958
config, err := framework.LoadConfig()
6059
if err != nil {
61-
e2elog.Failf("Failed to load config: %s", err)
60+
framework.Failf("Failed to load config: %s", err)
6261
}
6362
discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config)
6463
cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoveryClient)
@@ -73,7 +72,7 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
7372
kubeClient := f.ClientSet
7473
config, err := framework.LoadConfig()
7574
if err != nil {
76-
e2elog.Failf("Failed to load config: %s", err)
75+
framework.Failf("Failed to load config: %s", err)
7776
}
7877
discoveryClient := discovery.NewDiscoveryClientForConfigOrDie(config)
7978
cachedDiscoClient := cacheddiscovery.NewMemCacheClient(discoveryClient)
@@ -88,7 +87,7 @@ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() {
8887
kubeClient := f.ClientSet
8988
config, err := framework.LoadConfig()
9089
if err != nil {
91-
e2elog.Failf("Failed to load config: %s", err)
90+
framework.Failf("Failed to load config: %s", err)
9291
}
9392
externalMetricsClient := externalclient.NewForConfigOrDie(config)
9493
testExternalMetrics(f, kubeClient, externalMetricsClient)
@@ -103,32 +102,32 @@ func testCustomMetrics(f *framework.Framework, kubeClient clientset.Interface, c
103102

104103
gcmService, err := gcm.New(client)
105104
if err != nil {
106-
e2elog.Failf("Failed to create gcm service, %v", err)
105+
framework.Failf("Failed to create gcm service, %v", err)
107106
}
108107

109108
// Set up a cluster: create a custom metric and set up k8s-sd adapter
110109
err = CreateDescriptors(gcmService, projectID)
111110
if err != nil {
112-
e2elog.Failf("Failed to create metric descriptor: %s", err)
111+
framework.Failf("Failed to create metric descriptor: %s", err)
113112
}
114113
defer CleanupDescriptors(gcmService, projectID)
115114

116115
err = CreateAdapter(adapterDeployment)
117116
if err != nil {
118-
e2elog.Failf("Failed to set up: %s", err)
117+
framework.Failf("Failed to set up: %s", err)
119118
}
120119
defer CleanupAdapter(adapterDeployment)
121120

122121
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
123122
if err != nil {
124-
e2elog.Failf("Failed to create ClusterRoleBindings: %v", err)
123+
framework.Failf("Failed to create ClusterRoleBindings: %v", err)
125124
}
126125
defer kubeClient.RbacV1().ClusterRoleBindings().Delete(HPAPermissions.Name, &metav1.DeleteOptions{})
127126

128127
// Run application that exports the metric
129128
_, err = createSDExporterPods(f, kubeClient)
130129
if err != nil {
131-
e2elog.Failf("Failed to create stackdriver-exporter pod: %s", err)
130+
framework.Failf("Failed to create stackdriver-exporter pod: %s", err)
132131
}
133132
defer cleanupSDExporterPod(f, kubeClient)
134133

@@ -149,33 +148,33 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface,
149148

150149
gcmService, err := gcm.New(client)
151150
if err != nil {
152-
e2elog.Failf("Failed to create gcm service, %v", err)
151+
framework.Failf("Failed to create gcm service, %v", err)
153152
}
154153

155154
// Set up a cluster: create a custom metric and set up k8s-sd adapter
156155
err = CreateDescriptors(gcmService, projectID)
157156
if err != nil {
158-
e2elog.Failf("Failed to create metric descriptor: %s", err)
157+
framework.Failf("Failed to create metric descriptor: %s", err)
159158
}
160159
defer CleanupDescriptors(gcmService, projectID)
161160

162161
// Both deployments - for old and new resource model - expose External Metrics API.
163162
err = CreateAdapter(AdapterForOldResourceModel)
164163
if err != nil {
165-
e2elog.Failf("Failed to set up: %s", err)
164+
framework.Failf("Failed to set up: %s", err)
166165
}
167166
defer CleanupAdapter(AdapterForOldResourceModel)
168167

169168
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
170169
if err != nil {
171-
e2elog.Failf("Failed to create ClusterRoleBindings: %v", err)
170+
framework.Failf("Failed to create ClusterRoleBindings: %v", err)
172171
}
173172
defer kubeClient.RbacV1().ClusterRoleBindings().Delete(HPAPermissions.Name, &metav1.DeleteOptions{})
174173

175174
// Run application that exports the metric
176175
pod, err := createSDExporterPods(f, kubeClient)
177176
if err != nil {
178-
e2elog.Failf("Failed to create stackdriver-exporter pod: %s", err)
177+
framework.Failf("Failed to create stackdriver-exporter pod: %s", err)
179178
}
180179
defer cleanupSDExporterPod(f, kubeClient)
181180

@@ -190,34 +189,34 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface,
190189
func verifyResponsesFromCustomMetricsAPI(f *framework.Framework, customMetricsClient customclient.CustomMetricsClient, discoveryClient *discovery.DiscoveryClient) {
191190
resources, err := discoveryClient.ServerResourcesForGroupVersion("custom.metrics.k8s.io/v1beta1")
192191
if err != nil {
193-
e2elog.Failf("Failed to retrieve a list of supported metrics: %s", err)
192+
framework.Failf("Failed to retrieve a list of supported metrics: %s", err)
194193
}
195194
if !containsResource(resources.APIResources, "*/custom.googleapis.com|"+CustomMetricName) {
196-
e2elog.Failf("Metric '%s' expected but not received", CustomMetricName)
195+
framework.Failf("Metric '%s' expected but not received", CustomMetricName)
197196
}
198197
if !containsResource(resources.APIResources, "*/custom.googleapis.com|"+UnusedMetricName) {
199-
e2elog.Failf("Metric '%s' expected but not received", UnusedMetricName)
198+
framework.Failf("Metric '%s' expected but not received", UnusedMetricName)
200199
}
201200
value, err := customMetricsClient.NamespacedMetrics(f.Namespace.Name).GetForObject(schema.GroupKind{Group: "", Kind: "Pod"}, stackdriverExporterPod1, CustomMetricName, labels.NewSelector())
202201
if err != nil {
203-
e2elog.Failf("Failed query: %s", err)
202+
framework.Failf("Failed query: %s", err)
204203
}
205204
if value.Value.Value() != CustomMetricValue {
206-
e2elog.Failf("Unexpected metric value for metric %s: expected %v but received %v", CustomMetricName, CustomMetricValue, value.Value)
205+
framework.Failf("Unexpected metric value for metric %s: expected %v but received %v", CustomMetricName, CustomMetricValue, value.Value)
207206
}
208207
filter, err := labels.NewRequirement("name", selection.Equals, []string{stackdriverExporterLabel})
209208
if err != nil {
210-
e2elog.Failf("Couldn't create a label filter")
209+
framework.Failf("Couldn't create a label filter")
211210
}
212211
values, err := customMetricsClient.NamespacedMetrics(f.Namespace.Name).GetForObjects(schema.GroupKind{Group: "", Kind: "Pod"}, labels.NewSelector().Add(*filter), CustomMetricName, labels.NewSelector())
213212
if err != nil {
214-
e2elog.Failf("Failed query: %s", err)
213+
framework.Failf("Failed query: %s", err)
215214
}
216215
if len(values.Items) != 1 {
217-
e2elog.Failf("Expected results for exactly 1 pod, but %v results received", len(values.Items))
216+
framework.Failf("Expected results for exactly 1 pod, but %v results received", len(values.Items))
218217
}
219218
if values.Items[0].DescribedObject.Name != stackdriverExporterPod1 || values.Items[0].Value.Value() != CustomMetricValue {
220-
e2elog.Failf("Unexpected metric value for metric %s and pod %s: %v", CustomMetricName, values.Items[0].DescribedObject.Name, values.Items[0].Value.Value())
219+
framework.Failf("Unexpected metric value for metric %s and pod %s: %v", CustomMetricName, values.Items[0].DescribedObject.Name, values.Items[0].Value.Value())
221220
}
222221
}
223222

@@ -242,27 +241,27 @@ func verifyResponseFromExternalMetricsAPI(f *framework.Framework, externalMetric
242241
NamespacedMetrics("dummy").
243242
List("custom.googleapis.com|"+CustomMetricName, labels.NewSelector().Add(*req1, *req2, *req3, *req4, *req5))
244243
if err != nil {
245-
e2elog.Failf("Failed query: %s", err)
244+
framework.Failf("Failed query: %s", err)
246245
}
247246
if len(values.Items) != 1 {
248-
e2elog.Failf("Expected exactly one external metric value, but % values received", len(values.Items))
247+
framework.Failf("Expected exactly one external metric value, but % values received", len(values.Items))
249248
}
250249
if values.Items[0].MetricName != "custom.googleapis.com|"+CustomMetricName ||
251250
values.Items[0].Value.Value() != CustomMetricValue ||
252251
// Check one label just to make sure labels are included
253252
values.Items[0].MetricLabels["resource.labels.pod_id"] != string(pod.UID) {
254-
e2elog.Failf("Unexpected result for metric %s: %v", CustomMetricName, values.Items[0])
253+
framework.Failf("Unexpected result for metric %s: %v", CustomMetricName, values.Items[0])
255254
}
256255
}
257256

258257
func cleanupSDExporterPod(f *framework.Framework, cs clientset.Interface) {
259258
err := cs.CoreV1().Pods(f.Namespace.Name).Delete(stackdriverExporterPod1, &metav1.DeleteOptions{})
260259
if err != nil {
261-
e2elog.Logf("Failed to delete %s pod: %v", stackdriverExporterPod1, err)
260+
framework.Logf("Failed to delete %s pod: %v", stackdriverExporterPod1, err)
262261
}
263262
err = cs.CoreV1().Pods(f.Namespace.Name).Delete(stackdriverExporterPod2, &metav1.DeleteOptions{})
264263
if err != nil {
265-
e2elog.Logf("Failed to delete %s pod: %v", stackdriverExporterPod2, err)
264+
framework.Logf("Failed to delete %s pod: %v", stackdriverExporterPod2, err)
266265
}
267266
}
268267

‎test/e2e/instrumentation/monitoring/metrics_grabber.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
clientset "k8s.io/client-go/kubernetes"
2424
"k8s.io/kubernetes/test/e2e/framework"
25-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
2625
"k8s.io/kubernetes/test/e2e/framework/metrics"
2726
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
2827

@@ -72,7 +71,7 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
7271
}
7372
}
7473
if !masterRegistered {
75-
e2elog.Logf("Master is node api.Registry. Skipping testing Scheduler metrics.")
74+
framework.Logf("Master is node api.Registry. Skipping testing Scheduler metrics.")
7675
return
7776
}
7877
response, err := grabber.GrabFromScheduler()
@@ -93,7 +92,7 @@ var _ = instrumentation.SIGDescribe("MetricsGrabber", func() {
9392
}
9493
}
9594
if !masterRegistered {
96-
e2elog.Logf("Master is node api.Registry. Skipping testing ControllerManager metrics.")
95+
framework.Logf("Master is node api.Registry. Skipping testing ControllerManager metrics.")
9796
return
9897
}
9998
response, err := grabber.GrabFromControllerManager()

0 commit comments

Comments
 (0)