github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Parameterize ENABLE_{NODE,CLUSTER}_{LOGGING,MONITORING} and LOGGING_DESTINATION

Browse Source 
In config-{default,test.sh}. This will make it possible for e.g.
Jenkins to override LOGGING_DESTINATION. Also reorder the parameters
so they're in the same order across files for easier scanning.
This commit is contained in:
Zach Loafman 2015-02-03 16:52:05 -08:00
parent 75ebde3814
commit 2f546ce649
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cluster/gce/config-default.sh
View File

@ -49,9 +49,9 @@ function increment_ipv4 {
ip_dec=$((ip_dec<<8)) ip_dec=$((ip_dec<<8))
ip_dec=$((ip_dec + $comp)) ip_dec=$((ip_dec + $comp))
done done
ip_dec=$((ip_dec + $incr_amount)) ip_dec=$((ip_dec + $incr_amount))
ip_components=() ip_components=()
local i local i
for ((i=0; i < 4; i++)); do for ((i=0; i < 4; i++)); do
@ -61,13 +61,13 @@ function increment_ipv4 {
done done
echo "${ip_components[3]}.${ip_components[2]}.${ip_components[1]}.${ip_components[0]}" echo "${ip_components[3]}.${ip_components[2]}.${ip_components[1]}.${ip_components[0]}"
} }
node_count="${NUM_MINIONS}" node_count="${NUM_MINIONS}"
next_node="10.244.0.0" next_node="10.244.0.0"
node_subnet_size=24 node_subnet_size=24
node_subnet_count=$((2 ** (32-$node_subnet_size))) node_subnet_count=$((2 ** (32-$node_subnet_size)))
subnets=() subnets=()
for ((node_num=0; node_num<node_count; node_num++)); do for ((node_num=0; node_num<node_count; node_num++)); do
subnets+=("$next_node"/"${node_subnet_size}") subnets+=("$next_node"/"${node_subnet_size}")
next_node=$(increment_ipv4 $next_node $node_subnet_count) next_node=$(increment_ipv4 $next_node $node_subnet_count)
@ -81,21 +81,21 @@ MINION_SCOPES=("storage-ro" "compute-rw")
POLL_SLEEP_INTERVAL=3 POLL_SLEEP_INTERVAL=3
PORTAL_NET="10.0.0.0/16" PORTAL_NET="10.0.0.0/16"
# Optional: Install node monitoring.
ENABLE_NODE_MONITORING=true
# Optional: When set to true, heapster will be setup as part of the cluster bring up.
ENABLE_CLUSTER_MONITORING=true
# When set to true, Docker Cache is enabled by default as part of the cluster bring up. # When set to true, Docker Cache is enabled by default as part of the cluster bring up.
ENABLE_DOCKER_REGISTRY_CACHE=true ENABLE_DOCKER_REGISTRY_CACHE=true
# Optional: Install node monitoring.
ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"
# Optional: When set to true, heapster will be setup as part of the cluster bring up.
ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-true}"
# Optional: Enable node logging. # Optional: Enable node logging.
ENABLE_NODE_LOGGING=true ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}"
LOGGING_DESTINATION=elasticsearch # options: elasticsearch, gcp LOGGING_DESTINATION="${KUBE_LOGGING_DESTINATION:-elasticsearch}" # options: elasticsearch, gcp
# Optional: When set to true, Elasticsearch and Kibana will be setup as part of the cluster bring up. # Optional: When set to true, Elasticsearch and Kibana will be setup as part of the cluster bring up.
ENABLE_CLUSTER_LOGGING=true ENABLE_CLUSTER_LOGGING="${KUBE_ENABLE_CLUSTER_LOGGING:-true}"
ELASTICSEARCH_LOGGING_REPLICAS=1 ELASTICSEARCH_LOGGING_REPLICAS=1
# Don't require https for registries in our local RFC1918 network # Don't require https for registries in our local RFC1918 network

15
cluster/gce/config-test.sh
View File

@ -44,17 +44,20 @@ PORTAL_NET="10.0.0.0/16"
# When set to true, Docker Cache is enabled by default as part of the cluster bring up. # When set to true, Docker Cache is enabled by default as part of the cluster bring up.
ENABLE_DOCKER_REGISTRY_CACHE=true ENABLE_DOCKER_REGISTRY_CACHE=true
ENABLE_NODE_MONITORING=true # Optional: Install node monitoring.
ENABLE_NODE_MONITORING="${KUBE_ENABLE_NODE_MONITORING:-true}"
ENABLE_NODE_LOGGING=true # Optional: When set to true, heapster will be setup as part of the cluster bring up.
LOGGING_DESTINATION=elasticsearch # options: elasticsearch, gcp ENABLE_CLUSTER_MONITORING="${KUBE_ENABLE_CLUSTER_MONITORING:-false}"
# Optional: Enable node logging.
ENABLE_NODE_LOGGING="${KUBE_ENABLE_NODE_LOGGING:-true}"
LOGGING_DESTINATION="${KUBE_LOGGING_DESTINATION:-elasticsearch}" # options: elasticsearch, gcp
# Optional: When set to true, Elasticsearch and Kibana will be setup as part of the cluster bring up. # Optional: When set to true, Elasticsearch and Kibana will be setup as part of the cluster bring up.
ENABLE_CLUSTER_LOGGING=false ENABLE_CLUSTER_LOGGING="${KUBE_ENABLE_CLUSTER_LOGGING:-false}"
ELASTICSEARCH_LOGGING_REPLICAS=1 ELASTICSEARCH_LOGGING_REPLICAS=1
ENABLE_CLUSTER_MONITORING=false
# Don't require https for registries in our local RFC1918 network # Don't require https for registries in our local RFC1918 network
EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8" EXTRA_DOCKER_OPTS="--insecure-registry 10.0.0.0/8"