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
fcb4e5e2
Commit
fcb4e5e2
authored
Jul 14, 2015
by
Max Forbes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Log Project (GKE) less and cleanup bash indentation
parent
b3835665
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
util.sh
cluster/gke/util.sh
+3
-4
kube-up.sh
cluster/kube-up.sh
+2
-2
No files found.
cluster/gke/util.sh
View file @
fcb4e5e2
...
@@ -51,14 +51,13 @@ function detect-project() {
...
@@ -51,14 +51,13 @@ function detect-project() {
echo
"... in detect-project()"
>
&2
echo
"... in detect-project()"
>
&2
if
[[
-z
"
${
PROJECT
:-}
"
]]
;
then
if
[[
-z
"
${
PROJECT
:-}
"
]]
;
then
export
PROJECT
=
$(
"
${
GCLOUD
}
"
config list project |
tail
-n
1 |
cut
-f
3
-d
' '
)
export
PROJECT
=
$(
"
${
GCLOUD
}
"
config list project |
tail
-n
1 |
cut
-f
3
-d
' '
)
echo
"... Using project:
${
PROJECT
}
"
>
&2
fi
fi
if
[[
-z
"
${
PROJECT
:-}
"
]]
;
then
if
[[
-z
"
${
PROJECT
:-}
"
]]
;
then
echo
"Could not detect Google Cloud Platform project. Set the default project using "
>
&2
echo
"Could not detect Google Cloud Platform project. Set the default project using "
>
&2
echo
"'gcloud config set project <PROJECT>'"
>
&2
echo
"'gcloud config set project <PROJECT>'"
>
&2
exit
1
exit
1
fi
fi
echo
"Project:
${
PROJECT
}
"
>
&2
}
}
# Execute prior to running tests to build a release if required for env.
# Execute prior to running tests to build a release if required for env.
...
@@ -121,7 +120,7 @@ function kube-up() {
...
@@ -121,7 +120,7 @@ function kube-up() {
echo
"Creating new network:
${
NETWORK
}
"
>
&2
echo
"Creating new network:
${
NETWORK
}
"
>
&2
"
${
GCLOUD
}
"
compute networks create
"
${
NETWORK
}
"
--project
=
"
${
PROJECT
}
"
--range
"
${
NETWORK_RANGE
}
"
"
${
GCLOUD
}
"
compute networks create
"
${
NETWORK
}
"
--project
=
"
${
PROJECT
}
"
--range
"
${
NETWORK_RANGE
}
"
else
else
echo
"Using network:
${
NETWORK
}
"
>
&2
echo
"
...
Using network:
${
NETWORK
}
"
>
&2
fi
fi
# Allow SSH on all nodes in the network. This doesn't actually check whether
# Allow SSH on all nodes in the network. This doesn't actually check whether
...
@@ -134,7 +133,7 @@ function kube-up() {
...
@@ -134,7 +133,7 @@ function kube-up() {
--project
=
"
${
PROJECT
}
"
\
--project
=
"
${
PROJECT
}
"
\
--source-ranges
=
"0.0.0.0/0"
--source-ranges
=
"0.0.0.0/0"
else
else
echo
"Using firewall-rule:
${
FIREWALL_SSH
}
"
>
&2
echo
"
...
Using firewall-rule:
${
FIREWALL_SSH
}
"
>
&2
fi
fi
local
create_args
=(
local
create_args
=(
...
...
cluster/kube-up.sh
View file @
fcb4e5e2
...
@@ -28,7 +28,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
...
@@ -28,7 +28,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source
"
${
KUBE_ROOT
}
/cluster/kube-env.sh"
source
"
${
KUBE_ROOT
}
/cluster/kube-env.sh"
source
"
${
KUBE_ROOT
}
/cluster/
${
KUBERNETES_PROVIDER
}
/util.sh"
source
"
${
KUBE_ROOT
}
/cluster/
${
KUBERNETES_PROVIDER
}
/util.sh"
echo
"Starting cluster using provider:
$KUBERNETES_PROVIDER
"
>
&2
echo
"
...
Starting cluster using provider:
$KUBERNETES_PROVIDER
"
>
&2
echo
"... calling verify-prereqs"
>
&2
echo
"... calling verify-prereqs"
>
&2
verify-prereqs
verify-prereqs
...
@@ -36,7 +36,7 @@ verify-prereqs
...
@@ -36,7 +36,7 @@ verify-prereqs
echo
"... calling kube-up"
>
&2
echo
"... calling kube-up"
>
&2
kube-up
kube-up
echo
"... calling validate-cluster"
>
&2
echo
"... calling validate-cluster
.sh
"
>
&2
"
${
KUBE_ROOT
}
/cluster/validate-cluster.sh"
"
${
KUBE_ROOT
}
/cluster/validate-cluster.sh"
echo
-e
"Done, listing cluster services:
\n
"
>
&2
echo
-e
"Done, listing cluster services:
\n
"
>
&2
...
...
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