mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-04 04:08:16 +00:00 
			
		
		
		
	Enable passing hostname-override through environment variable
This commit is contained in:
		@@ -33,6 +33,7 @@ DNS_REPLICAS=${KUBE_DNS_REPLICAS:-1}
 | 
				
			|||||||
KUBECTL=${KUBECTL:-cluster/kubectl.sh}
 | 
					KUBECTL=${KUBECTL:-cluster/kubectl.sh}
 | 
				
			||||||
WAIT_FOR_URL_API_SERVER=${WAIT_FOR_URL_API_SERVER:-10}
 | 
					WAIT_FOR_URL_API_SERVER=${WAIT_FOR_URL_API_SERVER:-10}
 | 
				
			||||||
ENABLE_DAEMON=${ENABLE_DAEMON:-false}
 | 
					ENABLE_DAEMON=${ENABLE_DAEMON:-false}
 | 
				
			||||||
 | 
					HOSTNAME_OVERRIDE=${HOSTNAME_OVERRIDE:-"127.0.0.1"}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd "${KUBE_ROOT}"
 | 
					cd "${KUBE_ROOT}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -328,7 +329,7 @@ function start_kubelet {
 | 
				
			|||||||
        --container-runtime="${CONTAINER_RUNTIME}" \
 | 
					        --container-runtime="${CONTAINER_RUNTIME}" \
 | 
				
			||||||
        --rkt-path="${RKT_PATH}" \
 | 
					        --rkt-path="${RKT_PATH}" \
 | 
				
			||||||
        --rkt-stage1-image="${RKT_STAGE1_IMAGE}" \
 | 
					        --rkt-stage1-image="${RKT_STAGE1_IMAGE}" \
 | 
				
			||||||
        --hostname-override="127.0.0.1" \
 | 
					        --hostname-override="${HOSTNAME_OVERRIDE}" \
 | 
				
			||||||
        --address="127.0.0.1" \
 | 
					        --address="127.0.0.1" \
 | 
				
			||||||
        --api-servers="${API_HOST}:${API_PORT}" \
 | 
					        --api-servers="${API_HOST}:${API_PORT}" \
 | 
				
			||||||
        --cpu-cfs-quota=${CPU_CFS_QUOTA} \
 | 
					        --cpu-cfs-quota=${CPU_CFS_QUOTA} \
 | 
				
			||||||
@@ -354,7 +355,7 @@ function start_kubelet {
 | 
				
			|||||||
        -i \
 | 
					        -i \
 | 
				
			||||||
        --cidfile=$KUBELET_CIDFILE \
 | 
					        --cidfile=$KUBELET_CIDFILE \
 | 
				
			||||||
        gcr.io/google_containers/kubelet \
 | 
					        gcr.io/google_containers/kubelet \
 | 
				
			||||||
        /kubelet --v=3 --containerized ${priv_arg}--chaos-chance="${CHAOS_CHANCE}" --hostname-override="127.0.0.1" --address="127.0.0.1" --api-servers="${API_HOST}:${API_PORT}" --port="$KUBELET_PORT" --resource-container="" &> $KUBELET_LOG &
 | 
					        /kubelet --v=3 --containerized ${priv_arg}--chaos-chance="${CHAOS_CHANCE}" --hostname-override="${HOSTNAME_OVERRIDE}" --address="127.0.0.1" --api-servers="${API_HOST}:${API_PORT}" --port="$KUBELET_PORT" --resource-container="" &> $KUBELET_LOG &
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -362,7 +363,7 @@ function start_kubeproxy {
 | 
				
			|||||||
    PROXY_LOG=/tmp/kube-proxy.log
 | 
					    PROXY_LOG=/tmp/kube-proxy.log
 | 
				
			||||||
    sudo -E "${GO_OUT}/kube-proxy" \
 | 
					    sudo -E "${GO_OUT}/kube-proxy" \
 | 
				
			||||||
      --v=${LOG_LEVEL} \
 | 
					      --v=${LOG_LEVEL} \
 | 
				
			||||||
      --hostname-override="127.0.0.1" \
 | 
					      --hostname-override="${HOSTNAME_OVERRIDE}" \
 | 
				
			||||||
      --master="http://${API_HOST}:${API_PORT}" >"${PROXY_LOG}" 2>&1 &
 | 
					      --master="http://${API_HOST}:${API_PORT}" >"${PROXY_LOG}" 2>&1 &
 | 
				
			||||||
    PROXY_PID=$!
 | 
					    PROXY_PID=$!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user