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
7715290b
Commit
7715290b
authored
Jul 04, 2015
by
Eric Paris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert hack/ from --flag_name= to --flag-name=
parent
86ca88be
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
42 additions
and
42 deletions
+42
-42
local-up-cluster.sh
hack/local-up-cluster.sh
+12
-12
test-cmd.sh
hack/test-cmd.sh
+19
-19
test-update-storage-objects.sh
hack/test-update-storage-objects.sh
+6
-6
update-swagger-spec.sh
hack/update-swagger-spec.sh
+5
-5
No files found.
hack/local-up-cluster.sh
View file @
7715290b
...
@@ -213,15 +213,15 @@ function start_apiserver {
...
@@ -213,15 +213,15 @@ function start_apiserver {
APISERVER_LOG
=
/tmp/kube-apiserver.log
APISERVER_LOG
=
/tmp/kube-apiserver.log
sudo
-E
"
${
GO_OUT
}
/kube-apiserver"
${
priv_arg
}
\
sudo
-E
"
${
GO_OUT
}
/kube-apiserver"
${
priv_arg
}
\
--v
=
${
LOG_LEVEL
}
\
--v
=
${
LOG_LEVEL
}
\
--cert
_
dir
=
"
${
CERT_DIR
}
"
\
--cert
-
dir
=
"
${
CERT_DIR
}
"
\
--service
_account_key_
file
=
"
${
SERVICE_ACCOUNT_KEY
}
"
\
--service
-account-key-
file
=
"
${
SERVICE_ACCOUNT_KEY
}
"
\
--service
_account_
lookup
=
"
${
SERVICE_ACCOUNT_LOOKUP
}
"
\
--service
-account-
lookup
=
"
${
SERVICE_ACCOUNT_LOOKUP
}
"
\
--admission
_
control
=
"
${
ADMISSION_CONTROL
}
"
\
--admission
-
control
=
"
${
ADMISSION_CONTROL
}
"
\
--address
=
"
${
API_HOST
}
"
\
--address
=
"
${
API_HOST
}
"
\
--port
=
"
${
API_PORT
}
"
\
--port
=
"
${
API_PORT
}
"
\
--etcd
_
servers
=
"http://127.0.0.1:4001"
\
--etcd
-
servers
=
"http://127.0.0.1:4001"
\
--service-cluster-ip-range
=
"10.0.0.0/24"
\
--service-cluster-ip-range
=
"10.0.0.0/24"
\
--cors
_allowed_
origins
=
"
${
API_CORS_ALLOWED_ORIGINS
}
"
>
"
${
APISERVER_LOG
}
"
2>&1 &
--cors
-allowed-
origins
=
"
${
API_CORS_ALLOWED_ORIGINS
}
"
>
"
${
APISERVER_LOG
}
"
2>&1 &
APISERVER_PID
=
$!
APISERVER_PID
=
$!
# Wait for kube-apiserver to come up before launching the rest of the components.
# Wait for kube-apiserver to come up before launching the rest of the components.
...
@@ -233,8 +233,8 @@ function start_controller_manager {
...
@@ -233,8 +233,8 @@ function start_controller_manager {
CTLRMGR_LOG
=
/tmp/kube-controller-manager.log
CTLRMGR_LOG
=
/tmp/kube-controller-manager.log
sudo
-E
"
${
GO_OUT
}
/kube-controller-manager"
\
sudo
-E
"
${
GO_OUT
}
/kube-controller-manager"
\
--v
=
${
LOG_LEVEL
}
\
--v
=
${
LOG_LEVEL
}
\
--service
_account_private_key_
file
=
"
${
SERVICE_ACCOUNT_KEY
}
"
\
--service
-account-private-key-
file
=
"
${
SERVICE_ACCOUNT_KEY
}
"
\
--root
_ca_
file
=
"
${
ROOT_CA_FILE
}
"
\
--root
-ca-
file
=
"
${
ROOT_CA_FILE
}
"
\
--master
=
"
${
API_HOST
}
:
${
API_PORT
}
"
>
"
${
CTLRMGR_LOG
}
"
2>&1 &
--master
=
"
${
API_HOST
}
:
${
API_PORT
}
"
>
"
${
CTLRMGR_LOG
}
"
2>&1 &
CTLRMGR_PID
=
$!
CTLRMGR_PID
=
$!
}
}
...
@@ -244,11 +244,11 @@ function start_kubelet {
...
@@ -244,11 +244,11 @@ function start_kubelet {
if
[[
-z
"
${
DOCKERIZE_KUBELET
}
"
]]
;
then
if
[[
-z
"
${
DOCKERIZE_KUBELET
}
"
]]
;
then
sudo
-E
"
${
GO_OUT
}
/kubelet"
${
priv_arg
}
\
sudo
-E
"
${
GO_OUT
}
/kubelet"
${
priv_arg
}
\
--v
=
${
LOG_LEVEL
}
\
--v
=
${
LOG_LEVEL
}
\
--chaos
_
chance
=
"
${
CHAOS_CHANCE
}
"
\
--chaos
-
chance
=
"
${
CHAOS_CHANCE
}
"
\
--container
_
runtime
=
"
${
CONTAINER_RUNTIME
}
"
\
--container
-
runtime
=
"
${
CONTAINER_RUNTIME
}
"
\
--hostname
_
override
=
"127.0.0.1"
\
--hostname
-
override
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--api
_
servers
=
"
${
API_HOST
}
:
${
API_PORT
}
"
\
--api
-
servers
=
"
${
API_HOST
}
:
${
API_PORT
}
"
\
--port
=
"
$KUBELET_PORT
"
>
"
${
KUBELET_LOG
}
"
2>&1 &
--port
=
"
$KUBELET_PORT
"
>
"
${
KUBELET_LOG
}
"
2>&1 &
KUBELET_PID
=
$!
KUBELET_PID
=
$!
else
else
...
...
hack/test-cmd.sh
View file @
7715290b
...
@@ -99,29 +99,29 @@ kube::log::status "Running kubectl with no options"
...
@@ -99,29 +99,29 @@ kube::log::status "Running kubectl with no options"
kube::log::status
"Starting kubelet in masterless mode"
kube::log::status
"Starting kubelet in masterless mode"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kubelet"
\
"
${
KUBE_OUTPUT_HOSTBIN
}
/kubelet"
\
--really
_crash_for_
testing
=
true
\
--really
-crash-for-
testing
=
true
\
--root
_
dir
=
/tmp/kubelet.
$$
\
--root
-
dir
=
/tmp/kubelet.
$$
\
--cert
_
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--cert
-
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--docker
_
endpoint
=
"fake://"
\
--docker
-
endpoint
=
"fake://"
\
--hostname
_
override
=
"127.0.0.1"
\
--hostname
-
override
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--port
=
"
$KUBELET_PORT
"
\
--port
=
"
$KUBELET_PORT
"
\
--healthz
_
port
=
"
${
KUBELET_HEALTHZ_PORT
}
"
1>&2 &
--healthz
-
port
=
"
${
KUBELET_HEALTHZ_PORT
}
"
1>&2 &
KUBELET_PID
=
$!
KUBELET_PID
=
$!
kube::util::wait_for_url
"http://127.0.0.1:
${
KUBELET_HEALTHZ_PORT
}
/healthz"
"kubelet(masterless)"
kube::util::wait_for_url
"http://127.0.0.1:
${
KUBELET_HEALTHZ_PORT
}
/healthz"
"kubelet(masterless)"
kill
${
KUBELET_PID
}
1>&2 2>/dev/null
kill
${
KUBELET_PID
}
1>&2 2>/dev/null
kube::log::status
"Starting kubelet in masterful mode"
kube::log::status
"Starting kubelet in masterful mode"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kubelet"
\
"
${
KUBE_OUTPUT_HOSTBIN
}
/kubelet"
\
--really
_crash_for_
testing
=
true
\
--really
-crash-for-
testing
=
true
\
--root
_
dir
=
/tmp/kubelet.
$$
\
--root
-
dir
=
/tmp/kubelet.
$$
\
--cert
_
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--cert
-
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--docker
_
endpoint
=
"fake://"
\
--docker
-
endpoint
=
"fake://"
\
--hostname
_
override
=
"127.0.0.1"
\
--hostname
-
override
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--api
_
servers
=
"
${
API_HOST
}
:
${
API_PORT
}
"
\
--api
-
servers
=
"
${
API_HOST
}
:
${
API_PORT
}
"
\
--port
=
"
$KUBELET_PORT
"
\
--port
=
"
$KUBELET_PORT
"
\
--healthz
_
port
=
"
${
KUBELET_HEALTHZ_PORT
}
"
1>&2 &
--healthz
-
port
=
"
${
KUBELET_HEALTHZ_PORT
}
"
1>&2 &
KUBELET_PID
=
$!
KUBELET_PID
=
$!
kube::util::wait_for_url
"http://127.0.0.1:
${
KUBELET_HEALTHZ_PORT
}
/healthz"
"kubelet"
kube::util::wait_for_url
"http://127.0.0.1:
${
KUBELET_HEALTHZ_PORT
}
/healthz"
"kubelet"
...
@@ -130,13 +130,13 @@ kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kub
...
@@ -130,13 +130,13 @@ kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kub
kube::log::status
"Starting kube-apiserver"
kube::log::status
"Starting kube-apiserver"
KUBE_API_VERSIONS
=
"v1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
KUBE_API_VERSIONS
=
"v1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
--address
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--public
_address_
override
=
"127.0.0.1"
\
--public
-address-
override
=
"127.0.0.1"
\
--port
=
"
${
API_PORT
}
"
\
--port
=
"
${
API_PORT
}
"
\
--etcd
_
servers
=
"http://
${
ETCD_HOST
}
:
${
ETCD_PORT
}
"
\
--etcd
-
servers
=
"http://
${
ETCD_HOST
}
:
${
ETCD_PORT
}
"
\
--public
_address_
override
=
"127.0.0.1"
\
--public
-address-
override
=
"127.0.0.1"
\
--kubelet
_
port
=
${
KUBELET_PORT
}
\
--kubelet
-
port
=
${
KUBELET_PORT
}
\
--runtime
_
config
=
api/v1
\
--runtime
-
config
=
api/v1
\
--cert
_
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--cert
-
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--service-cluster-ip-range
=
"10.0.0.0/24"
1>&2 &
--service-cluster-ip-range
=
"10.0.0.0/24"
1>&2 &
APISERVER_PID
=
$!
APISERVER_PID
=
$!
...
...
hack/test-update-storage-objects.sh
View file @
7715290b
...
@@ -46,13 +46,13 @@ function startApiServer() {
...
@@ -46,13 +46,13 @@ function startApiServer() {
KUBE_API_VERSIONS
=
"
${
KUBE_API_VERSIONS
}
"
\
KUBE_API_VERSIONS
=
"
${
KUBE_API_VERSIONS
}
"
\
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
--address
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--public
_address_
override
=
"127.0.0.1"
\
--public
-address-
override
=
"127.0.0.1"
\
--port
=
"
${
API_PORT
}
"
\
--port
=
"
${
API_PORT
}
"
\
--etcd
_
servers
=
"http://
${
ETCD_HOST
}
:
${
ETCD_PORT
}
"
\
--etcd
-
servers
=
"http://
${
ETCD_HOST
}
:
${
ETCD_PORT
}
"
\
--public
_address_
override
=
"127.0.0.1"
\
--public
-address-
override
=
"127.0.0.1"
\
--kubelet
_
port
=
${
KUBELET_PORT
}
\
--kubelet
-
port
=
${
KUBELET_PORT
}
\
--runtime
_
config
=
"
${
RUNTIME_CONFIG
}
"
\
--runtime
-
config
=
"
${
RUNTIME_CONFIG
}
"
\
--cert
_
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--cert
-
dir
=
"
${
TMPDIR
:-
/tmp/
}
"
\
--service-cluster-ip-range
=
"10.0.0.0/24"
1>&2 &
--service-cluster-ip-range
=
"10.0.0.0/24"
1>&2 &
APISERVER_PID
=
$!
APISERVER_PID
=
$!
...
...
hack/update-swagger-spec.sh
View file @
7715290b
...
@@ -51,12 +51,12 @@ KUBELET_PORT=${KUBELET_PORT:-10250}
...
@@ -51,12 +51,12 @@ KUBELET_PORT=${KUBELET_PORT:-10250}
kube::log::status
"Starting kube-apiserver"
kube::log::status
"Starting kube-apiserver"
KUBE_API_VERSIONS
=
"v1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
KUBE_API_VERSIONS
=
"v1"
"
${
KUBE_OUTPUT_HOSTBIN
}
/kube-apiserver"
\
--address
=
"127.0.0.1"
\
--address
=
"127.0.0.1"
\
--public
_address_
override
=
"127.0.0.1"
\
--public
-address-
override
=
"127.0.0.1"
\
--port
=
"
${
API_PORT
}
"
\
--port
=
"
${
API_PORT
}
"
\
--etcd
_
servers
=
"http://
${
ETCD_HOST
}
:
${
ETCD_PORT
}
"
\
--etcd
-
servers
=
"http://
${
ETCD_HOST
}
:
${
ETCD_PORT
}
"
\
--public
_address_
override
=
"127.0.0.1"
\
--public
-address-
override
=
"127.0.0.1"
\
--kubelet
_
port
=
${
KUBELET_PORT
}
\
--kubelet
-
port
=
${
KUBELET_PORT
}
\
--runtime
_
config
=
api/v1
\
--runtime
-
config
=
api/v1
\
--service-cluster-ip-range
=
"10.0.0.0/24"
>
/dev/null 2>&1 &
--service-cluster-ip-range
=
"10.0.0.0/24"
>
/dev/null 2>&1 &
APISERVER_PID
=
$!
APISERVER_PID
=
$!
...
...
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