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
15f0068c
Commit
15f0068c
authored
Jan 07, 2015
by
Zach Loafman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow specifying GCE network in GKE provider, default to "e2e" for tests
parent
c8244cd1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
config-default.sh
cluster/gke/config-default.sh
+1
-0
config-test.sh
cluster/gke/config-test.sh
+1
-0
util.sh
cluster/gke/util.sh
+2
-1
No files found.
cluster/gke/config-default.sh
View file @
15f0068c
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
# The following are default-specific settings.
# The following are default-specific settings.
CLUSTER_NAME
=
"
${
CLUSTER_NAME
:-${
USER
}
-gke
}
"
CLUSTER_NAME
=
"
${
CLUSTER_NAME
:-${
USER
}
-gke
}
"
NETWORK
=
${
KUBE_GKE_NETWORK
:-
default
}
# For ease of maintenance, extract any pieces that do not vary between default
# For ease of maintenance, extract any pieces that do not vary between default
# and test in a common config.
# and test in a common config.
...
...
cluster/gke/config-test.sh
View file @
15f0068c
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
# The following are test-specific settings.
# The following are test-specific settings.
CLUSTER_NAME
=
"
${
CLUSTER_NAME
:-${
USER
}
-gke-e2e
}
"
CLUSTER_NAME
=
"
${
CLUSTER_NAME
:-${
USER
}
-gke-e2e
}
"
NETWORK
=
${
KUBE_GKE_NETWORK
:-
e2e
}
# For ease of maintenance, extract any pieces that do not vary between default
# For ease of maintenance, extract any pieces that do not vary between default
# and test in a common config.
# and test in a common config.
...
...
cluster/gke/util.sh
View file @
15f0068c
...
@@ -93,7 +93,8 @@ function kube-up() {
...
@@ -93,7 +93,8 @@ function kube-up() {
--zone
=
"
${
ZONE
}
"
\
--zone
=
"
${
ZONE
}
"
\
--project
=
"
${
PROJECT
}
"
\
--project
=
"
${
PROJECT
}
"
\
--cluster-api-version
=
"
${
CLUSTER_API_VERSION
:-}
"
\
--cluster-api-version
=
"
${
CLUSTER_API_VERSION
:-}
"
\
--num-nodes
=
"
${
NUM_MINIONS
}
"
--num-nodes
=
"
${
NUM_MINIONS
}
"
\
--network
=
"
${
NETWORK
}
"
# Compute DNS_SERVER_IP: This is looking for something like
# Compute DNS_SERVER_IP: This is looking for something like
# "servicesIpv4Cidr: 10.27.240.0/20" and returning "10.27.240"
# "servicesIpv4Cidr: 10.27.240.0/20" and returning "10.27.240"
...
...
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