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
cafbdba7
Commit
cafbdba7
authored
May 24, 2016
by
gmarek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change base64 -d flag to --decode flag to make it BSD compatible
parent
e58788be
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
26 deletions
+26
-26
configure-vm.sh
cluster/gce/configure-vm.sh
+5
-5
configure-node.sh
cluster/gce/coreos/configure-node.sh
+5
-5
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+3
-3
configure-helper.sh
cluster/gce/trusty/configure-helper.sh
+5
-5
start-kubemark.sh
test/kubemark/start-kubemark.sh
+8
-8
No files found.
cluster/gce/configure-vm.sh
View file @
cafbdba7
...
...
@@ -577,14 +577,14 @@ function create-salt-master-auth() {
if
[[
!
-z
"
${
CA_CERT
:-}
"
]]
&&
[[
!
-z
"
${
MASTER_CERT
:-}
"
]]
&&
[[
!
-z
"
${
MASTER_KEY
:-}
"
]]
;
then
mkdir
-p
/srv/kubernetes
(
umask
077
;
echo
"
${
CA_CERT
}
"
|
base64
-
d
>
/srv/kubernetes/ca.crt
;
echo
"
${
MASTER_CERT
}
"
|
base64
-
d
>
/srv/kubernetes/server.cert
;
echo
"
${
MASTER_KEY
}
"
|
base64
-
d
>
/srv/kubernetes/server.key
;
echo
"
${
CA_CERT
}
"
|
base64
-
-decode
>
/srv/kubernetes/ca.crt
;
echo
"
${
MASTER_CERT
}
"
|
base64
-
-decode
>
/srv/kubernetes/server.cert
;
echo
"
${
MASTER_KEY
}
"
|
base64
-
-decode
>
/srv/kubernetes/server.key
;
# Kubecfg cert/key are optional and included for backwards compatibility.
# TODO(roberthbailey): Remove these two lines once GKE no longer requires
# fetching clients certs from the master VM.
echo
"
${
KUBECFG_CERT
:-}
"
|
base64
-
d
>
/srv/kubernetes/kubecfg.crt
;
echo
"
${
KUBECFG_KEY
:-}
"
|
base64
-
d
>
/srv/kubernetes/kubecfg.key
)
echo
"
${
KUBECFG_CERT
:-}
"
|
base64
-
-decode
>
/srv/kubernetes/kubecfg.crt
;
echo
"
${
KUBECFG_KEY
:-}
"
|
base64
-
-decode
>
/srv/kubernetes/kubecfg.key
)
fi
fi
if
[
!
-e
"
${
BASIC_AUTH_FILE
}
"
]
;
then
...
...
cluster/gce/coreos/configure-node.sh
View file @
cafbdba7
...
...
@@ -239,14 +239,14 @@ function create-salt-master-auth() {
if
[[
!
-z
"
${
CA_CERT
:-}
"
]]
&&
[[
!
-z
"
${
MASTER_CERT
:-}
"
]]
&&
[[
!
-z
"
${
MASTER_KEY
:-}
"
]]
;
then
mkdir
-p
/srv/kubernetes
(
umask
077
;
echo
"
${
CA_CERT
}
"
|
base64
-
d
>
/srv/kubernetes/ca.crt
;
echo
"
${
MASTER_CERT
}
"
|
base64
-
d
>
/srv/kubernetes/server.cert
;
echo
"
${
MASTER_KEY
}
"
|
base64
-
d
>
/srv/kubernetes/server.key
;
echo
"
${
CA_CERT
}
"
|
base64
-
-decode
>
/srv/kubernetes/ca.crt
;
echo
"
${
MASTER_CERT
}
"
|
base64
-
-decode
>
/srv/kubernetes/server.cert
;
echo
"
${
MASTER_KEY
}
"
|
base64
-
-decode
>
/srv/kubernetes/server.key
;
# Kubecfg cert/key are optional and included for backwards compatibility.
# TODO(roberthbailey): Remove these two lines once GKE no longer requires
# fetching clients certs from the master VM.
echo
"
${
KUBECFG_CERT
:-}
"
|
base64
-
d
>
/srv/kubernetes/kubecfg.crt
;
echo
"
${
KUBECFG_KEY
:-}
"
|
base64
-
d
>
/srv/kubernetes/kubecfg.key
)
echo
"
${
KUBECFG_CERT
:-}
"
|
base64
-
-decode
>
/srv/kubernetes/kubecfg.crt
;
echo
"
${
KUBECFG_KEY
:-}
"
|
base64
-
-decode
>
/srv/kubernetes/kubecfg.key
)
fi
fi
if
[
!
-e
"
${
BASIC_AUTH_FILE
}
"
]
;
then
...
...
cluster/gce/gci/configure-helper.sh
View file @
cafbdba7
...
...
@@ -100,9 +100,9 @@ function create-master-auth {
echo
"Creating master auth files"
local
-r
auth_dir
=
"/etc/srv/kubernetes"
if
[[
!
-e
"
${
auth_dir
}
/ca.crt"
&&
!
-z
"
${
CA_CERT
:-}
"
&&
!
-z
"
${
MASTER_CERT
:-}
"
&&
!
-z
"
${
MASTER_KEY
:-}
"
]]
;
then
echo
"
${
CA_CERT
}
"
|
base64
-
d
>
"
${
auth_dir
}
/ca.crt"
echo
"
${
MASTER_CERT
}
"
|
base64
-
d
>
"
${
auth_dir
}
/server.cert"
echo
"
${
MASTER_KEY
}
"
|
base64
-
d
>
"
${
auth_dir
}
/server.key"
echo
"
${
CA_CERT
}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/ca.crt"
echo
"
${
MASTER_CERT
}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/server.cert"
echo
"
${
MASTER_KEY
}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/server.key"
fi
local
-r
basic_auth_csv
=
"
${
auth_dir
}
/basic_auth.csv"
if
[[
!
-e
"
${
basic_auth_csv
}
"
]]
;
then
...
...
cluster/gce/trusty/configure-helper.sh
View file @
cafbdba7
...
...
@@ -280,14 +280,14 @@ create_master_auth() {
readonly
auth_dir
=
"/etc/srv/kubernetes"
if
[
!
-e
"
${
auth_dir
}
/ca.crt"
]
;
then
if
[
!
-z
"
${
CA_CERT
:-}
"
]
&&
[
!
-z
"
${
MASTER_CERT
:-}
"
]
&&
[
!
-z
"
${
MASTER_KEY
:-}
"
]
;
then
echo
"
${
CA_CERT
}
"
|
base64
-
d
>
"
${
auth_dir
}
/ca.crt"
echo
"
${
MASTER_CERT
}
"
|
base64
-
d
>
"
${
auth_dir
}
/server.cert"
echo
"
${
MASTER_KEY
}
"
|
base64
-
d
>
"
${
auth_dir
}
/server.key"
echo
"
${
CA_CERT
}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/ca.crt"
echo
"
${
MASTER_CERT
}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/server.cert"
echo
"
${
MASTER_KEY
}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/server.key"
# Kubecfg cert/key are optional and included for backwards compatibility.
# TODO(roberthbailey): Remove these two lines once GKE no longer requires
# fetching clients certs from the master VM.
echo
"
${
KUBECFG_CERT
:-}
"
|
base64
-
d
>
"
${
auth_dir
}
/kubecfg.crt"
echo
"
${
KUBECFG_KEY
:-}
"
|
base64
-
d
>
"
${
auth_dir
}
/kubecfg.key"
echo
"
${
KUBECFG_CERT
:-}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/kubecfg.crt"
echo
"
${
KUBECFG_KEY
:-}
"
|
base64
-
-decode
>
"
${
auth_dir
}
/kubecfg.key"
fi
fi
readonly
basic_auth_csv
=
"
${
auth_dir
}
/basic_auth.csv"
...
...
test/kubemark/start-kubemark.sh
View file @
cafbdba7
...
...
@@ -126,9 +126,9 @@ create-certs ${MASTER_IP}
KUBELET_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
KUBE_PROXY_TOKEN
=
$(
dd
if
=
/dev/urandom
bs
=
128
count
=
1 2>/dev/null |
base64
|
tr
-d
"=+/"
|
dd
bs
=
32
count
=
1 2>/dev/null
)
echo
"
${
CA_CERT_BASE64
}
"
|
base64
-
d
>
"
${
RESOURCE_DIRECTORY
}
/ca.crt"
echo
"
${
KUBECFG_CERT_BASE64
}
"
|
base64
-
d
>
"
${
RESOURCE_DIRECTORY
}
/kubecfg.crt"
echo
"
${
KUBECFG_KEY_BASE64
}
"
|
base64
-
d
>
"
${
RESOURCE_DIRECTORY
}
/kubecfg.key"
echo
"
${
CA_CERT_BASE64
}
"
|
base64
-
-decode
>
"
${
RESOURCE_DIRECTORY
}
/ca.crt"
echo
"
${
KUBECFG_CERT_BASE64
}
"
|
base64
-
-decode
>
"
${
RESOURCE_DIRECTORY
}
/kubecfg.crt"
echo
"
${
KUBECFG_KEY_BASE64
}
"
|
base64
-
-decode
>
"
${
RESOURCE_DIRECTORY
}
/kubecfg.key"
until
gcloud compute ssh
--zone
=
"
${
ZONE
}
"
--project
=
"
${
PROJECT
}
"
"
${
MASTER_NAME
}
"
--command
=
"ls"
&> /dev/null
;
do
sleep
1
...
...
@@ -138,11 +138,11 @@ password=$(python -c 'import string,random; print("".join(random.SystemRandom().
gcloud compute ssh
--zone
=
"
${
ZONE
}
"
--project
=
"
${
PROJECT
}
"
"
${
MASTER_NAME
}
"
\
--command
=
"sudo mkdir /srv/kubernetes -p &&
\
sudo bash -c
\"
echo
${
MASTER_CERT_BASE64
}
| base64 -
d
> /srv/kubernetes/server.cert
\"
&&
\
sudo bash -c
\"
echo
${
MASTER_KEY_BASE64
}
| base64 -
d
> /srv/kubernetes/server.key
\"
&&
\
sudo bash -c
\"
echo
${
CA_CERT_BASE64
}
| base64 -
d
> /srv/kubernetes/ca.crt
\"
&&
\
sudo bash -c
\"
echo
${
KUBECFG_CERT_BASE64
}
| base64 -
d
> /srv/kubernetes/kubecfg.crt
\"
&&
\
sudo bash -c
\"
echo
${
KUBECFG_KEY_BASE64
}
| base64 -
d
> /srv/kubernetes/kubecfg.key
\"
&&
\
sudo bash -c
\"
echo
${
MASTER_CERT_BASE64
}
| base64 -
-decode
> /srv/kubernetes/server.cert
\"
&&
\
sudo bash -c
\"
echo
${
MASTER_KEY_BASE64
}
| base64 -
-decode
> /srv/kubernetes/server.key
\"
&&
\
sudo bash -c
\"
echo
${
CA_CERT_BASE64
}
| base64 -
-decode
> /srv/kubernetes/ca.crt
\"
&&
\
sudo bash -c
\"
echo
${
KUBECFG_CERT_BASE64
}
| base64 -
-decode
> /srv/kubernetes/kubecfg.crt
\"
&&
\
sudo bash -c
\"
echo
${
KUBECFG_KEY_BASE64
}
| base64 -
-decode
> /srv/kubernetes/kubecfg.key
\"
&&
\
sudo bash -c
\"
echo
\"
${
KUBE_BEARER_TOKEN
}
,admin,admin
\"
> /srv/kubernetes/known_tokens.csv
\"
&&
\
sudo bash -c
\"
echo
\"
${
KUBELET_TOKEN
}
,kubelet,kubelet
\"
>> /srv/kubernetes/known_tokens.csv
\"
&&
\
sudo bash -c
\"
echo
\"
${
KUBE_PROXY_TOKEN
}
,kube_proxy,kube_proxy
\"
>> /srv/kubernetes/known_tokens.csv
\"
&&
\
...
...
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