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
6f30aa78
Commit
6f30aa78
authored
Jun 12, 2015
by
CJ Cullen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make GKE-CI test firewalls work on Jenkins
parent
b3ab7d8d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
util.sh
cluster/gke/util.sh
+4
-2
No files found.
cluster/gke/util.sh
View file @
6f30aa78
...
@@ -160,6 +160,7 @@ function kube-up() {
...
@@ -160,6 +160,7 @@ function kube-up() {
# Assumed vars:
# Assumed vars:
# CLUSTER_NAME
# CLUSTER_NAME
# GCLOUD
# GCLOUD
# ZONE
# Vars set:
# Vars set:
# MINION_TAG
# MINION_TAG
function
test-setup
()
{
function
test-setup
()
{
...
@@ -169,7 +170,7 @@ function test-setup() {
...
@@ -169,7 +170,7 @@ function test-setup() {
detect-minions
>
&2
detect-minions
>
&2
# At this point, CLUSTER_NAME should have been used, so its value is final.
# At this point, CLUSTER_NAME should have been used, so its value is final.
MINION_TAG
=
$(
$GCLOUD
compute instances describe
${
MINION_NAMES
[0]
}
|
grep
-o
"gke-
${
CLUSTER_NAME
}
-.
\{
8
\}
-node"
|
head
-1
)
MINION_TAG
=
$(
$GCLOUD
compute instances describe
${
MINION_NAMES
[0]
}
--project
=
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
|
grep
-o
"gke-
${
CLUSTER_NAME
}
-.
\{
8
\}
-node"
|
head
-1
)
OLD_MINION_TAG
=
"k8s-
${
CLUSTER_NAME
}
-node"
OLD_MINION_TAG
=
"k8s-
${
CLUSTER_NAME
}
-node"
# Open up port 80 & 8080 so common containers on minions can be reached.
# Open up port 80 & 8080 so common containers on minions can be reached.
...
@@ -305,13 +306,14 @@ function restart-apiserver() {
...
@@ -305,13 +306,14 @@ function restart-apiserver() {
# CLUSTER_NAME
# CLUSTER_NAME
# GCLOUD
# GCLOUD
# KUBE_ROOT
# KUBE_ROOT
# ZONE
function
test-teardown
()
{
function
test-teardown
()
{
echo
"... in test-teardown()"
>
&2
echo
"... in test-teardown()"
>
&2
detect-project
>
&2
detect-project
>
&2
detect-minions
>
&2
detect-minions
>
&2
# At this point, CLUSTER_NAME should have been used, so its value is final.
# At this point, CLUSTER_NAME should have been used, so its value is final.
MINION_TAG
=
$(
$GCLOUD
compute instances describe
${
MINION_NAMES
[0]
}
|
grep
-o
"gke-
${
CLUSTER_NAME
}
-.
\{
8
\}
-node"
|
head
-1
)
MINION_TAG
=
$(
$GCLOUD
compute instances describe
${
MINION_NAMES
[0]
}
--project
=
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
|
grep
-o
"gke-
${
CLUSTER_NAME
}
-.
\{
8
\}
-node"
|
head
-1
)
# First, remove anything we did with test-setup (currently, the firewall).
# First, remove anything we did with test-setup (currently, the firewall).
# NOTE: Keep in sync with names above in test-setup.
# NOTE: Keep in sync with names above in test-setup.
...
...
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