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
f2d14990
Commit
f2d14990
authored
Mar 21, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #23180 from roberthbailey/dead-code
Auto commit by PR queue bot
parents
0a28a381
c5ca042e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1 addition
and
67 deletions
+1
-67
util.sh
cluster/aws/util.sh
+0
-10
util.sh
cluster/gce/util.sh
+0
-14
util.sh
cluster/gke/util.sh
+1
-13
util.sh
cluster/libvirt-coreos/util.sh
+0
-10
util.sh
cluster/mesos/docker/util.sh
+0
-10
util.sh
cluster/vagrant/util.sh
+0
-10
No files found.
cluster/aws/util.sh
View file @
f2d14990
...
@@ -1601,16 +1601,6 @@ function ssh-to-node {
...
@@ -1601,16 +1601,6 @@ function ssh-to-node {
ssh
-oLogLevel
=
quiet
-oConnectTimeout
=
30
-oStrictHostKeyChecking
=
no
-i
"
${
AWS_SSH_KEY
}
"
${
SSH_USER
}
@
${
ip
}
"
${
cmd
}
"
ssh
-oLogLevel
=
quiet
-oConnectTimeout
=
30
-oStrictHostKeyChecking
=
no
-i
"
${
AWS_SSH_KEY
}
"
${
SSH_USER
}
@
${
ip
}
"
${
cmd
}
"
}
}
# Restart the kube-proxy on a node ($1)
function
restart-kube-proxy
{
ssh-to-node
"
$1
"
"sudo /etc/init.d/kube-proxy restart"
}
# Restart the kube-apiserver on a node ($1)
function
restart-apiserver
{
ssh-to-node
"
$1
"
"sudo /etc/init.d/kube-apiserver restart"
}
# Perform preparations required to run e2e tests
# Perform preparations required to run e2e tests
function
prepare-e2e
()
{
function
prepare-e2e
()
{
# (AWS runs detect-project, I don't think we need to anything)
# (AWS runs detect-project, I don't think we need to anything)
...
...
cluster/gce/util.sh
View file @
f2d14990
...
@@ -1347,20 +1347,6 @@ function ssh-to-node {
...
@@ -1347,20 +1347,6 @@ function ssh-to-node {
gcloud compute ssh
--ssh-flag
=
"-o LogLevel=quiet"
--ssh-flag
=
"-o ConnectTimeout=30"
--project
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
"
${
node
}
"
--command
"
${
cmd
}
"
gcloud compute ssh
--ssh-flag
=
"-o LogLevel=quiet"
--ssh-flag
=
"-o ConnectTimeout=30"
--project
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
"
${
node
}
"
--command
"
${
cmd
}
"
}
}
# Restart the kube-proxy on a node ($1)
function
restart-kube-proxy
{
if
[[
"
${
OS_DISTRIBUTION
}
"
==
"trusty"
]]
;
then
ssh-to-node
"
$1
"
"sudo initctl restart kube-proxy"
else
ssh-to-node
"
$1
"
"sudo /etc/init.d/kube-proxy restart"
fi
}
# Restart the kube-apiserver on a node ($1)
function
restart-apiserver
{
ssh-to-node
"
$1
"
"sudo docker ps | grep /kube-apiserver | cut -d ' ' -f 1 | xargs sudo docker kill"
}
# Perform preparations required to run e2e tests
# Perform preparations required to run e2e tests
function
prepare-e2e
()
{
function
prepare-e2e
()
{
detect-project
detect-project
...
...
cluster/gke/util.sh
View file @
f2d14990
...
@@ -171,7 +171,7 @@ function test-setup() {
...
@@ -171,7 +171,7 @@ function test-setup() {
"
${
KUBE_ROOT
}
/cluster/kube-up.sh"
"
${
KUBE_ROOT
}
/cluster/kube-up.sh"
detect-nodes
>
&2
detect-nodes
>
&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.
NODE_TAG
=
$(
$GCLOUD
compute instances describe
${
NODE_NAMES
[0]
}
--project
=
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
|
grep
-o
"gke-
${
CLUSTER_NAME
}
-.
\{
8
\}
-node"
|
head
-1
)
NODE_TAG
=
$(
$GCLOUD
compute instances describe
${
NODE_NAMES
[0]
}
--project
=
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
|
grep
-o
"gke-
${
CLUSTER_NAME
}
-.
\{
8
\}
-node"
|
head
-1
)
OLD_NODE_TAG
=
"k8s-
${
CLUSTER_NAME
}
-node"
OLD_NODE_TAG
=
"k8s-
${
CLUSTER_NAME
}
-node"
...
@@ -272,18 +272,6 @@ function ssh-to-node() {
...
@@ -272,18 +272,6 @@ function ssh-to-node() {
gcloud compute ssh
--ssh-flag
=
"-o LogLevel=quiet"
--ssh-flag
=
"-o ConnectTimeout=30"
--project
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
"
${
node
}
"
--command
"
${
cmd
}
"
gcloud compute ssh
--ssh-flag
=
"-o LogLevel=quiet"
--ssh-flag
=
"-o ConnectTimeout=30"
--project
"
${
PROJECT
}
"
--zone
=
"
${
ZONE
}
"
"
${
node
}
"
--command
"
${
cmd
}
"
}
}
# Restart the kube-proxy on a node ($1)
function
restart-kube-proxy
()
{
echo
"... in gke:restart-kube-proxy()"
>
&2
ssh-to-node
"
$1
"
"sudo /etc/init.d/kube-proxy restart"
}
# Restart the kube-proxy on master ($1)
function
restart-apiserver
()
{
echo
"... in gke:restart-apiserver()"
>
&2
ssh-to-node
"
$1
"
"sudo docker ps | grep /kube-apiserver | cut -d ' ' -f 1 | xargs sudo docker kill"
}
# Execute after running tests to perform any required clean-up. This is called
# Execute after running tests to perform any required clean-up. This is called
# from hack/e2e.go. This calls kube-down, so the cluster still exists when this
# from hack/e2e.go. This calls kube-down, so the cluster still exists when this
# is called.
# is called.
...
...
cluster/libvirt-coreos/util.sh
View file @
f2d14990
...
@@ -371,16 +371,6 @@ function ssh-to-node {
...
@@ -371,16 +371,6 @@ function ssh-to-node {
ssh
-o
ConnectTimeout
=
30
-o
StrictHostKeyChecking
=
no
-o
UserKnownHostsFile
=
/dev/null
-o
ControlMaster
=
no
"core@
$machine
"
"
$cmd
"
ssh
-o
ConnectTimeout
=
30
-o
StrictHostKeyChecking
=
no
-o
UserKnownHostsFile
=
/dev/null
-o
ControlMaster
=
no
"core@
$machine
"
"
$cmd
"
}
}
# Restart the kube-proxy on a node ($1)
function
restart-kube-proxy
{
ssh-to-node
"
$1
"
"sudo systemctl restart kube-proxy"
}
# Restart the apiserver
function
restart-apiserver
{
ssh-to-node
"
$1
"
"sudo systemctl restart kube-apiserver"
}
# Perform preparations required to run e2e tests
# Perform preparations required to run e2e tests
function
prepare-e2e
()
{
function
prepare-e2e
()
{
echo
"libvirt-coreos doesn't need special preparations for e2e tests"
1>&2
echo
"libvirt-coreos doesn't need special preparations for e2e tests"
1>&2
...
...
cluster/mesos/docker/util.sh
View file @
f2d14990
...
@@ -334,16 +334,6 @@ function ssh-to-node {
...
@@ -334,16 +334,6 @@ function ssh-to-node {
echo
"TODO: ssh-to-node"
1>&2
echo
"TODO: ssh-to-node"
1>&2
}
}
# Restart the kube-proxy on a node ($1)
function
restart-kube-proxy
{
echo
"TODO: restart-kube-proxy"
1>&2
}
# Restart the apiserver
function
restart-apiserver
{
echo
"TODO: restart-apiserver"
1>&2
}
# Waits for a kube-system pod (of the provided name) to have the phase/status "Running".
# Waits for a kube-system pod (of the provided name) to have the phase/status "Running".
function
cluster::mesos::docker::await_ready
{
function
cluster::mesos::docker::await_ready
{
local
pod_name
=
"
$1
"
local
pod_name
=
"
$1
"
...
...
cluster/vagrant/util.sh
View file @
f2d14990
...
@@ -377,16 +377,6 @@ function ssh-to-node {
...
@@ -377,16 +377,6 @@ function ssh-to-node {
vagrant ssh
"
${
machine
}
"
-c
"
${
cmd
}
"
vagrant ssh
"
${
machine
}
"
-c
"
${
cmd
}
"
}
}
# Restart the kube-proxy on a node ($1)
function
restart-kube-proxy
{
ssh-to-node
"
$1
"
"sudo systemctl restart kube-proxy"
}
# Restart the apiserver
function
restart-apiserver
{
ssh-to-node
"
$1
"
"sudo systemctl restart kube-apiserver"
}
# Perform preparations required to run e2e tests
# Perform preparations required to run e2e tests
function
prepare-e2e
()
{
function
prepare-e2e
()
{
echo
"Vagrant doesn't need special preparations for e2e tests"
1>&2
echo
"Vagrant doesn't need special preparations for e2e tests"
1>&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