github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Delete namespace parameter in create adapter

Browse Source
This commit is contained in:
zhouya0 2020-09-16 11:44:30 +08:00
parent 76e0e25118
commit 59bc823547
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/instrumentation/monitoring/custom_metrics_deployments.go
View File

@ -252,11 +252,11 @@ func prometheusExporterPodSpec(metricName string, metricValue int64, port int32)
// CreateAdapter creates Custom Metrics - Stackdriver adapter // CreateAdapter creates Custom Metrics - Stackdriver adapter
// adapterDeploymentFile should be a filename for adapter deployment located in StagingDeploymentLocation // adapterDeploymentFile should be a filename for adapter deployment located in StagingDeploymentLocation
func CreateAdapter(namespace, adapterDeploymentFile string) error { func CreateAdapter(adapterDeploymentFile string) error {
// A workaround to make the work on GKE. GKE doesn't normally allow to create cluster roles, // A workaround to make the work on GKE. GKE doesn't normally allow to create cluster roles,
// which the adapter deployment does. The solution is to create cluster role binding for // which the adapter deployment does. The solution is to create cluster role binding for
// cluster-admin role and currently used service account. // cluster-admin role and currently used service account.
err := createClusterAdminBinding(namespace) err := createClusterAdminBinding()
if err != nil { if err != nil {
return err return err
} }
@ -265,12 +265,12 @@ func CreateAdapter(namespace, adapterDeploymentFile string) error {
if err != nil { if err != nil {
return err return err
} }
stat, err := framework.RunKubectl(namespace, "create", "-f", adapterURL) stat, err := framework.RunKubectl("create", "-f", adapterURL)
framework.Logf(stat) framework.Logf(stat)
return err return err
} }
func createClusterAdminBinding(namespace string) error { func createClusterAdminBinding() error {
stdout, stderr, err := framework.RunCmd("gcloud", "config", "get-value", "core/account") stdout, stderr, err := framework.RunCmd("gcloud", "config", "get-value", "core/account")
if err != nil { if err != nil {
framework.Logf(stderr) framework.Logf(stderr)
@ -278,7 +278,7 @@ func createClusterAdminBinding(namespace string) error {
} }
serviceAccount := strings.TrimSpace(stdout) serviceAccount := strings.TrimSpace(stdout)
framework.Logf("current service account: %q", serviceAccount) framework.Logf("current service account: %q", serviceAccount)
stat, err := framework.RunKubectl(namespace, "create", "clusterrolebinding", ClusterAdminBinding, "--clusterrole=cluster-admin", "--user="+serviceAccount) stat, err := framework.RunKubectl("create", "clusterrolebinding", ClusterAdminBinding, "--clusterrole=cluster-admin", "--user="+serviceAccount)
framework.Logf(stat) framework.Logf(stat)
return err return err
} }