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
96b5c332
Commit
96b5c332
authored
Jan 13, 2018
by
Mike Danese
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cluster: remove centos dependency on saltbase
parent
fa7dde38
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
6 deletions
+1
-6
make-ca-cert.sh
cluster/centos/make-ca-cert.sh
+0
-5
util.sh
cluster/centos/util.sh
+1
-1
No files found.
cluster/
saltbase/salt/generate-cert
/make-ca-cert.sh
→
cluster/
centos
/make-ca-cert.sh
View file @
96b5c332
...
...
@@ -33,11 +33,6 @@ mkdir -p "$cert_dir"
use_cn
=
false
# TODO: Add support for discovery on other providers?
if
[
"
$cert_ip
"
==
"_use_gce_external_ip_"
]
;
then
cert_ip
=
$(
curl
-s
-H
Metadata-Flavor:Google http://metadata.google.internal./computeMetadata/v1/instance/network-interfaces/0/access-configs/0/external-ip
)
fi
sans
=
"IP:
${
cert_ip
}
"
if
[[
-n
"
${
extra_sans
}
"
]]
;
then
sans
=
"
${
sans
}
,
${
extra_sans
}
"
...
...
cluster/centos/util.sh
View file @
96b5c332
...
...
@@ -234,7 +234,7 @@ echo "[INFO] tear-down-node on $1"
# Generate the CA certificates for k8s components
function
make-ca-cert
()
{
echo
"[INFO] make-ca-cert"
bash
"
${
ROOT
}
/
../saltbase/salt/generate-cert/
make-ca-cert.sh"
"
${
MASTER_ADVERTISE_IP
}
"
"IP:
${
MASTER_ADVERTISE_IP
}
,IP:
${
SERVICE_CLUSTER_IP_RANGE
%.*
}
.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
bash
"
${
ROOT
}
/make-ca-cert.sh"
"
${
MASTER_ADVERTISE_IP
}
"
"IP:
${
MASTER_ADVERTISE_IP
}
,IP:
${
SERVICE_CLUSTER_IP_RANGE
%.*
}
.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local"
}
# Provision master
...
...
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