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

Merge pull request #53266 from mikedanese/compute-rw

Browse Source 
Automatic merge from submit-queue. 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>.

gce: remove compute-rw, see what breaks

Fixes https://github.com/kubernetes/kubernetes/issues/8074

**Release note**:
```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-29 21:11:39 -07:00 committed by GitHub
commit e3dc09d95c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/config-common.sh
View File

@ -99,7 +99,7 @@ function get-cluster-ip-range {
}
if [[ "${FEDERATION:-}" == true ]]; then
NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro,https://www.googleapis.com/auth/ndev.clouddns.readwrite}"
NODE_SCOPES="${NODE_SCOPES:-monitoring,logging-write,storage-ro,https://www.googleapis.com/auth/ndev.clouddns.readwrite}"
else
NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}"
NODE_SCOPES="${NODE_SCOPES:-monitoring,logging-write,storage-ro}"
fi

4
cluster/gce/config-default.sh
View File

@ -96,9 +96,9 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-$(get-cluster-ip-range)}"
MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
if [[ "${FEDERATION:-}" == true ]]; then
NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro,https://www.googleapis.com/auth/ndev.clouddns.readwrite}"
NODE_SCOPES="${NODE_SCOPES:-monitoring,logging-write,storage-ro,https://www.googleapis.com/auth/ndev.clouddns.readwrite}"
else
NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}"
NODE_SCOPES="${NODE_SCOPES:-monitoring,logging-write,storage-ro}"
fi
# Extra docker options for nodes.

2
test/kubemark/gce/util.sh
View File

@ -62,7 +62,7 @@ function create-master-instance-with-resources {
--image "${MASTER_IMAGE}" \
--tags "${MASTER_TAG}" \
--subnet "${NETWORK}" \
--scopes "storage-ro,compute-rw,logging-write" \
--scopes "storage-ro,logging-write" \
--boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \
--disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"