knative
/
pkg
mirror of https://github.com/knative/pkg.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

give cloud-platform scope by default (#1015)

This commit is contained in:
Chi Zhang 2020-01-27 17:39:26 -08:00 committed by Knative Prow Robot
parent d6f121ffaf
commit b51ee347cb
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/gke/request.go
View File

@ -114,6 +114,15 @@ func NewCreateClusterRequest(request *Request) (*container.CreateClusterRequest,
}, },
Config: &container.NodeConfig{ Config: &container.NodeConfig{
MachineType: request.NodeType, MachineType: request.NodeType,
// The set of Google API scopes to be made available on all
// of the node VMs under the "default" service account.
// If unspecified, no scopes are added, unless Cloud Logging or
// Cloud Monitoring are enabled, in which case their required
// scopes will be added.
// `https://www.googleapis.com/auth/devstorage.read_only` is required
// for communicating with **gcr.io**, and it's included in cloud-platform scope.
// TODO(chizhg): give more fine granular scope based on the actual needs.
OauthScopes: []string{container.CloudPlatformScope},
}, },
}, },
}, },

26
testutils/clustermanager/e2e-tests/gke_test.go
View File

@ -600,7 +600,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -630,7 +630,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -657,7 +657,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -698,7 +698,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -724,7 +724,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -752,7 +752,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -779,7 +779,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -818,7 +818,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -846,7 +846,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -872,7 +872,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -897,7 +897,7 @@ func TestAcquire(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -1080,7 +1080,7 @@ func TestDelete(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },
@ -1171,7 +1171,7 @@ func TestDelete(t *testing.T) {
{ {
Name: "default-pool", Name: "default-pool",
InitialNodeCount: DefaultGKEMinNodes, InitialNodeCount: DefaultGKEMinNodes,
Config: &container.NodeConfig{MachineType: "n1-standard-4"}, Config: &container.NodeConfig{MachineType: "n1-standard-4", OauthScopes: []string{container.CloudPlatformScope}},
Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1}, Autoscaling: &container.NodePoolAutoscaling{Enabled: true, MaxNodeCount: 3, MinNodeCount: 1},
}, },
}, },