github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

generate-cert: allow for alternative paths

Browse Source 
Instead of hard coding kube-cert and /srv/kubernetes allow these to be
overwritten by environment variables.  / is immutable on some systems
and so /srv is not a possible location to store data.
This commit is contained in:
Eric Paris 2015-06-10 12:50:14 -04:00
parent b90663924b
commit 6b9ef5b2d8
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/saltbase/salt/generate-cert/make-ca-cert.sh
View File

@ -20,8 +20,8 @@ set -o pipefail
cert_ip=$1 cert_ip=$1
extra_sans=${2:-} extra_sans=${2:-}
cert_dir=/srv/kubernetes cert_dir=${CERT_DIR:-/srv/kubernetes}
cert_group=kube-cert cert_group=${CERT_GROUP:-kube-cert}
mkdir -p "$cert_dir" mkdir -p "$cert_dir"

4
cluster/saltbase/salt/generate-cert/make-cert.sh
View File

@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
cert_dir=/srv/kubernetes cert_dir=${CERT_DIR:-/srv/kubernetes}
cert_group=kube-cert cert_group=${CERT_GROUP:-kube-cert}
mkdir -p "$cert_dir" mkdir -p "$cert_dir"

3
cluster/saltbase/salt/kube-addons/kube-addons.sh
View File

@ -22,6 +22,7 @@ KUBECTL=${KUBECTL_BIN:-/usr/local/bin/kubectl}
ADDON_CHECK_INTERVAL_SEC=${TEST_ADDON_CHECK_INTERVAL_SEC:-600} ADDON_CHECK_INTERVAL_SEC=${TEST_ADDON_CHECK_INTERVAL_SEC:-600}
SYSTEM_NAMESPACE=kube-system SYSTEM_NAMESPACE=kube-system
token_dir=${TOKEN_DIR:-/srv/kubernetes}
function create-kubeconfig-secret() { function create-kubeconfig-secret() {
local -r token=$1 local -r token=$1
@ -174,7 +175,7 @@ while read line; do
# do not have DNS available will have to override the server. # do not have DNS available will have to override the server.
create-kubeconfig-secret "${token}" "${username}" "https://kubernetes.default" create-kubeconfig-secret "${token}" "${username}" "https://kubernetes.default"
fi fi
done < /srv/kubernetes/known_tokens.csv done < ${token_dir}/known_tokens.csv
# Create admission_control objects if defined before any other addon services. If the limits # Create admission_control objects if defined before any other addon services. If the limits
# are defined in a namespace other than default, we should still create the limits for the # are defined in a namespace other than default, we should still create the limits for the