Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
3f5fbee1
Commit
3f5fbee1
authored
Jun 15, 2016
by
Madhusudan.C.S
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move GCE NODE_SCOPES to config-common.sh and enable DNS scope in GKE.
parent
fac6f1c3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
config-common.sh
cluster/gce/config-common.sh
+6
-0
config-test.sh
cluster/gce/config-test.sh
+0
-1
config-common.sh
cluster/gke/config-common.sh
+5
-1
No files found.
cluster/gce/config-common.sh
View file @
3f5fbee1
...
@@ -35,3 +35,9 @@ function get-master-size {
...
@@ -35,3 +35,9 @@ function get-master-size {
fi
fi
echo
"
${
suggested_master_size
}
"
echo
"
${
suggested_master_size
}
"
}
}
if
[[
"
${
FEDERATION
:-}
"
==
true
]]
;
then
NODE_SCOPES
=
"
${
NODE_SCOPES
:-
compute
-rw,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
}
"
fi
cluster/gce/config-test.sh
View file @
3f5fbee1
...
@@ -57,7 +57,6 @@ MASTER_TAG="${INSTANCE_PREFIX}-master"
...
@@ -57,7 +57,6 @@ MASTER_TAG="${INSTANCE_PREFIX}-master"
NODE_TAG
=
"
${
INSTANCE_PREFIX
}
-minion"
NODE_TAG
=
"
${
INSTANCE_PREFIX
}
-minion"
CLUSTER_IP_RANGE
=
"
${
CLUSTER_IP_RANGE
:-
10
.180.0.0/14
}
"
CLUSTER_IP_RANGE
=
"
${
CLUSTER_IP_RANGE
:-
10
.180.0.0/14
}
"
MASTER_IP_RANGE
=
"
${
MASTER_IP_RANGE
:-
10
.246.0.0/24
}
"
MASTER_IP_RANGE
=
"
${
MASTER_IP_RANGE
:-
10
.246.0.0/24
}
"
NODE_SCOPES
=
"
${
NODE_SCOPES
:-
compute
-rw,monitoring,logging-write,storage-ro
}
"
RUNTIME_CONFIG
=
"
${
KUBE_RUNTIME_CONFIG
:-}
"
RUNTIME_CONFIG
=
"
${
KUBE_RUNTIME_CONFIG
:-}
"
TERMINATED_POD_GC_THRESHOLD
=
${
TERMINATED_POD_GC_THRESHOLD
:-
100
}
TERMINATED_POD_GC_THRESHOLD
=
${
TERMINATED_POD_GC_THRESHOLD
:-
100
}
...
...
cluster/gke/config-common.sh
View file @
3f5fbee1
...
@@ -28,9 +28,13 @@ FIREWALL_SSH="${FIREWALL_SSH:-${NETWORK}-allow-ssh}"
...
@@ -28,9 +28,13 @@ FIREWALL_SSH="${FIREWALL_SSH:-${NETWORK}-allow-ssh}"
GCLOUD
=
"
${
GCLOUD
:-
gcloud
}
"
GCLOUD
=
"
${
GCLOUD
:-
gcloud
}
"
CMD_GROUP
=
"
${
CMD_GROUP
:-}
"
CMD_GROUP
=
"
${
CMD_GROUP
:-}
"
GCLOUD_CONFIG_DIR
=
"
${
GCLOUD_CONFIG_DIR
:-${
HOME
}
/.config/gcloud/kubernetes
}
"
GCLOUD_CONFIG_DIR
=
"
${
GCLOUD_CONFIG_DIR
:-${
HOME
}
/.config/gcloud/kubernetes
}
"
NODE_SCOPES
=
"
${
NODE_SCOPES
:-
"compute-rw,storage-ro"
}
"
MACHINE_TYPE
=
"
${
MACHINE_TYPE
:-
n1
-standard-2
}
"
MACHINE_TYPE
=
"
${
MACHINE_TYPE
:-
n1
-standard-2
}
"
IMAGE_TYPE
=
"
${
IMAGE_TYPE
:-}
"
IMAGE_TYPE
=
"
${
IMAGE_TYPE
:-}
"
if
[[
"
${
FEDERATION
:-}
"
==
true
]]
;
then
NODE_SCOPES
=
"
${
NODE_SCOPES
:-
compute
-rw,storage-ro,https
://www.googleapis.com/auth/ndev.clouddns.readwrite
}
"
else
NODE_SCOPES
=
"
${
NODE_SCOPES
:-
compute
-rw,storage-ro
}
"
fi
# WARNING: any new vars added here must correspond to options that can be
# WARNING: any new vars added here must correspond to options that can be
# passed to `gcloud {CMD_GROUP} container clusters create`, or they will
# passed to `gcloud {CMD_GROUP} container clusters create`, or they will
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment