github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-23 18:40:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20066 from justinsb/aws_move_build_runtime_config

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-01 09:48:27 -08:00
commit 0aca70016c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/aws/util.sh
View File

@ -535,8 +535,6 @@ function create-dhcp-option-set () {
# Verify prereqs # Verify prereqs
function verify-prereqs { function verify-prereqs {
build-runtime-config
if [[ "$(which aws)" == "" ]]; then if [[ "$(which aws)" == "" ]]; then
echo "Can't find aws in PATH, please fix and retry." echo "Can't find aws in PATH, please fix and retry."
exit 1 exit 1
@ -909,6 +907,9 @@ function kube-up {
# Starts the master node # Starts the master node
function start-master() { function start-master() {
# Ensure RUNTIME_CONFIG is populated
build-runtime-config
# Get or create master persistent volume # Get or create master persistent volume
ensure-master-pd ensure-master-pd
@ -1088,6 +1089,9 @@ function start-master() {
# Creates an ASG for the minion nodes # Creates an ASG for the minion nodes
function start-minions() { function start-minions() {
# Minions don't currently use runtime config, but call it anyway for sanity
build-runtime-config
echo "Creating minion configuration" echo "Creating minion configuration"
generate-minion-user-data > "${KUBE_TEMP}/minion-user-data" generate-minion-user-data > "${KUBE_TEMP}/minion-user-data"
local public_ip_option local public_ip_option