Skip to content

K
k3s
Unverified Commit 73c52665 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67320 from hanxiaoshuai/fix0810

Automatic merge from submit-queue (batch tested with PRs 67294, 67320, 67335, 67334, 67325). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix some minor mistakes in e2e **What this PR does / why we need it**: fix some minor mistakes in e2e **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents dcc9d823 bad744a8
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go
View file @ 73c52665
...@@ -109,7 +109,10 @@ func testCustomMetrics(f *framework.Framework, kubeClient clientset.Interface, c ...@@ -109,7 +109,10 @@ func testCustomMetrics(f *framework.Framework, kubeClient clientset.Interface, c
defer CleanupAdapter(adapterDeployment) defer CleanupAdapter(adapterDeployment)
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions) _, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
defer kubeClient.RbacV1().ClusterRoleBindings().Delete("custom-metrics-reader", &metav1.DeleteOptions{}) if err != nil {
framework.Failf("Failed to create ClusterRoleBindings: %v", err)
}
defer kubeClient.RbacV1().ClusterRoleBindings().Delete(HPAPermissions.Name, &metav1.DeleteOptions{})
// Run application that exports the metric // Run application that exports the metric
_, err = createSDExporterPods(f, kubeClient) _, err = createSDExporterPods(f, kubeClient)
...@@ -153,7 +156,10 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface, ...@@ -153,7 +156,10 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface,
defer CleanupAdapter(AdapterForOldResourceModel) defer CleanupAdapter(AdapterForOldResourceModel)
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions) _, err = kubeClient.RbacV1().ClusterRoleBindings().Create(HPAPermissions)
defer kubeClient.RbacV1().ClusterRoleBindings().Delete("custom-metrics-reader", &metav1.DeleteOptions{}) if err != nil {
framework.Failf("Failed to create ClusterRoleBindings: %v", err)
}
defer kubeClient.RbacV1().ClusterRoleBindings().Delete(HPAPermissions.Name, &metav1.DeleteOptions{})
// Run application that exports the metric // Run application that exports the metric
pod, err := createSDExporterPods(f, kubeClient) pod, err := createSDExporterPods(f, kubeClient)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment