From e85e7a8e3293fc0516b960d9954e8815d2983d66 Mon Sep 17 00:00:00 2001 From: Nacho Cano Date: Tue, 15 Oct 2019 22:33:36 -0700 Subject: [PATCH 1/3] updating pkg --- Gopkg.lock | 4 ++-- test/performance/tools/common.sh | 2 +- vendor/knative.dev/pkg/testutils/gke/addon.go | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 6f3a66eaafb..e5e2d8e5534 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1242,7 +1242,7 @@ [[projects]] branch = "master" - digest = "1:65171358e818b1a970f43f886342ef0db6f8cfb2cd4c33b5c5381d846fa64013" + digest = "1:9cbababf809526beba72d5c43e877708afc1f200a697b54dc18507c370f20ea8" name = "knative.dev/pkg" packages = [ "apis", @@ -1331,7 +1331,7 @@ "webhook", ] pruneopts = "T" - revision = "e76e90e464c7caa87abdf840d599911ad1fb7b3e" + revision = "757d7e4c7706e3fc60d72627e8a7250e909a137e" [[projects]] branch = "master" diff --git a/test/performance/tools/common.sh b/test/performance/tools/common.sh index 8aa7890a4cc..5016c07b88a 100644 --- a/test/performance/tools/common.sh +++ b/test/performance/tools/common.sh @@ -52,7 +52,7 @@ function create_cluster() { function create_secret() { echo "Create service account on cluster $1 in zone $2" gcloud container clusters get-credentials $1 --zone=$2 --project=${PROJECT_NAME} || abort "Failed to get cluster creds" - kubectl create secret generic service-account --from-file=robot.json=${PERF_TEST_GOOGLE_APPLICATION_CREDENTIALS} + kubectl create secret generic knative-gcp-mako --from-file=robot.json=${PERF_TEST_GOOGLE_APPLICATION_CREDENTIALS} } # Set up the user credentials for cluster operations. diff --git a/vendor/knative.dev/pkg/testutils/gke/addon.go b/vendor/knative.dev/pkg/testutils/gke/addon.go index 4300fb4daf3..f8f98d0254e 100644 --- a/vendor/knative.dev/pkg/testutils/gke/addon.go +++ b/vendor/knative.dev/pkg/testutils/gke/addon.go @@ -25,20 +25,29 @@ import ( const ( // Define all supported addons here - istio = "istio" + istio = "istio" + hpa = "horizontalpodautoscaling" + hlb = "httploadbalancing" + cloudRun = "cloudrun" ) // GetAddonsConfig gets AddonsConfig from a slice of addon names, contains the logic of // converting string argument to typed AddonsConfig, for example `IstioConfig`. -// Currently supports istio +// Currently supports Istio, HorizontalPodAutoscaling, HttpLoadBalancing and CloudRun. func GetAddonsConfig(addons []string) *container.AddonsConfig { ac := &container.AddonsConfig{} for _, name := range addons { switch strings.ToLower(name) { case istio: ac.IstioConfig = &container.IstioConfig{Disabled: false} + case hpa: + ac.HorizontalPodAutoscaling = &container.HorizontalPodAutoscaling{Disabled: false} + case hlb: + ac.HttpLoadBalancing = &container.HttpLoadBalancing{Disabled: false} + case cloudRun: + ac.CloudRunConfig = &container.CloudRunConfig{Disabled: false} default: - panic(fmt.Sprintf("addon type %q not supported. Has to be one of: %q", name, istio)) + panic(fmt.Sprintf("addon type %q not supported. Has to be one of: %q", name, []string{istio, hpa, hlb, cloudRun})) } } From b55b2cc653b76273798e0d9f1b140be39c386078 Mon Sep 17 00:00:00 2001 From: Nacho Cano Date: Tue, 15 Oct 2019 23:03:14 -0700 Subject: [PATCH 2/3] Revert "updating pkg" This reverts commit e85e7a8e3293fc0516b960d9954e8815d2983d66. --- Gopkg.lock | 4 ++-- test/performance/tools/common.sh | 2 +- vendor/knative.dev/pkg/testutils/gke/addon.go | 15 +++------------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index e5e2d8e5534..6f3a66eaafb 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1242,7 +1242,7 @@ [[projects]] branch = "master" - digest = "1:9cbababf809526beba72d5c43e877708afc1f200a697b54dc18507c370f20ea8" + digest = "1:65171358e818b1a970f43f886342ef0db6f8cfb2cd4c33b5c5381d846fa64013" name = "knative.dev/pkg" packages = [ "apis", @@ -1331,7 +1331,7 @@ "webhook", ] pruneopts = "T" - revision = "757d7e4c7706e3fc60d72627e8a7250e909a137e" + revision = "e76e90e464c7caa87abdf840d599911ad1fb7b3e" [[projects]] branch = "master" diff --git a/test/performance/tools/common.sh b/test/performance/tools/common.sh index 5016c07b88a..8aa7890a4cc 100644 --- a/test/performance/tools/common.sh +++ b/test/performance/tools/common.sh @@ -52,7 +52,7 @@ function create_cluster() { function create_secret() { echo "Create service account on cluster $1 in zone $2" gcloud container clusters get-credentials $1 --zone=$2 --project=${PROJECT_NAME} || abort "Failed to get cluster creds" - kubectl create secret generic knative-gcp-mako --from-file=robot.json=${PERF_TEST_GOOGLE_APPLICATION_CREDENTIALS} + kubectl create secret generic service-account --from-file=robot.json=${PERF_TEST_GOOGLE_APPLICATION_CREDENTIALS} } # Set up the user credentials for cluster operations. diff --git a/vendor/knative.dev/pkg/testutils/gke/addon.go b/vendor/knative.dev/pkg/testutils/gke/addon.go index f8f98d0254e..4300fb4daf3 100644 --- a/vendor/knative.dev/pkg/testutils/gke/addon.go +++ b/vendor/knative.dev/pkg/testutils/gke/addon.go @@ -25,29 +25,20 @@ import ( const ( // Define all supported addons here - istio = "istio" - hpa = "horizontalpodautoscaling" - hlb = "httploadbalancing" - cloudRun = "cloudrun" + istio = "istio" ) // GetAddonsConfig gets AddonsConfig from a slice of addon names, contains the logic of // converting string argument to typed AddonsConfig, for example `IstioConfig`. -// Currently supports Istio, HorizontalPodAutoscaling, HttpLoadBalancing and CloudRun. +// Currently supports istio func GetAddonsConfig(addons []string) *container.AddonsConfig { ac := &container.AddonsConfig{} for _, name := range addons { switch strings.ToLower(name) { case istio: ac.IstioConfig = &container.IstioConfig{Disabled: false} - case hpa: - ac.HorizontalPodAutoscaling = &container.HorizontalPodAutoscaling{Disabled: false} - case hlb: - ac.HttpLoadBalancing = &container.HttpLoadBalancing{Disabled: false} - case cloudRun: - ac.CloudRunConfig = &container.CloudRunConfig{Disabled: false} default: - panic(fmt.Sprintf("addon type %q not supported. Has to be one of: %q", name, []string{istio, hpa, hlb, cloudRun})) + panic(fmt.Sprintf("addon type %q not supported. Has to be one of: %q", name, istio)) } } From 85814e8efcdc19a19be952de20fcffd4d6f8703c Mon Sep 17 00:00:00 2001 From: Nacho Cano Date: Tue, 29 Oct 2019 00:14:03 -0700 Subject: [PATCH 3/3] adding nachocano to owners and reviewers --- OWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OWNERS b/OWNERS index 13763b5b179..340c33596c4 100644 --- a/OWNERS +++ b/OWNERS @@ -5,6 +5,7 @@ approvers: - vaikas-google - n3wscott - matzew +- nachocano # Reviewers are suggested from the reviewers list first, then the approvers # list. To add reviewers while spreading the load among existing approvers, @@ -16,5 +17,6 @@ reviewers: - vaikas-google - n3wscott - matzew +- nachocano # Add reviewers below - lionelvillard