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
1102656c
Commit
1102656c
authored
Aug 21, 2017
by
Zihong Zheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set up KUBE_PROXY_DAEMONSET env for GCE and common.sh.
parent
79f2dc6a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
common.sh
cluster/common.sh
+1
-0
config-default.sh
cluster/gce/config-default.sh
+4
-0
config-test.sh
cluster/gce/config-test.sh
+4
-0
configure-vm.sh
cluster/gce/configure-vm.sh
+1
-0
No files found.
cluster/common.sh
View file @
1102656c
...
@@ -638,6 +638,7 @@ DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
...
@@ -638,6 +638,7 @@ DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
DNS_DOMAIN:
$(
yaml-quote
${
DNS_DOMAIN
:-})
DNS_DOMAIN:
$(
yaml-quote
${
DNS_DOMAIN
:-})
ENABLE_DNS_HORIZONTAL_AUTOSCALER:
$(
yaml-quote
${
ENABLE_DNS_HORIZONTAL_AUTOSCALER
:-
false
})
ENABLE_DNS_HORIZONTAL_AUTOSCALER:
$(
yaml-quote
${
ENABLE_DNS_HORIZONTAL_AUTOSCALER
:-
false
})
KUBELET_TOKEN:
$(
yaml-quote
${
KUBELET_TOKEN
:-})
KUBELET_TOKEN:
$(
yaml-quote
${
KUBELET_TOKEN
:-})
KUBE_PROXY_DAEMONSET:
$(
yaml-quote
${
KUBE_PROXY_DAEMONSET
:-
false
})
KUBE_PROXY_TOKEN:
$(
yaml-quote
${
KUBE_PROXY_TOKEN
:-})
KUBE_PROXY_TOKEN:
$(
yaml-quote
${
KUBE_PROXY_TOKEN
:-})
NODE_PROBLEM_DETECTOR_TOKEN:
$(
yaml-quote
${
NODE_PROBLEM_DETECTOR_TOKEN
:-})
NODE_PROBLEM_DETECTOR_TOKEN:
$(
yaml-quote
${
NODE_PROBLEM_DETECTOR_TOKEN
:-})
ADMISSION_CONTROL:
$(
yaml-quote
${
ADMISSION_CONTROL
:-})
ADMISSION_CONTROL:
$(
yaml-quote
${
ADMISSION_CONTROL
:-})
...
...
cluster/gce/config-default.sh
View file @
1102656c
...
@@ -297,3 +297,7 @@ PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUE
...
@@ -297,3 +297,7 @@ PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUE
PROMETHEUS_TO_SD_ENDPOINT
=
"
${
PROMETHEUS_TO_SD_ENDPOINT
:-
https
://monitoring.googleapis.com/
}
"
PROMETHEUS_TO_SD_ENDPOINT
=
"
${
PROMETHEUS_TO_SD_ENDPOINT
:-
https
://monitoring.googleapis.com/
}
"
PROMETHEUS_TO_SD_PREFIX
=
"
${
PROMETHEUS_TO_SD_PREFIX
:-
custom
.googleapis.com
}
"
PROMETHEUS_TO_SD_PREFIX
=
"
${
PROMETHEUS_TO_SD_PREFIX
:-
custom
.googleapis.com
}
"
ENABLE_PROMETHEUS_TO_SD
=
"
${
ENABLE_PROMETHEUS_TO_SD
:-
false
}
"
ENABLE_PROMETHEUS_TO_SD
=
"
${
ENABLE_PROMETHEUS_TO_SD
:-
false
}
"
# TODO(#51292): Make kube-proxy Daemonset default and remove the configuration here.
# Optional: Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
KUBE_PROXY_DAEMONSET
=
"
${
KUBE_PROXY_DAEMONSET
:-
false
}
"
# true, false
cluster/gce/config-test.sh
View file @
1102656c
...
@@ -356,3 +356,7 @@ PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUE
...
@@ -356,3 +356,7 @@ PROVIDER_VARS="${PROVIDER_VARS:-} FLUENTD_GCP_MEMORY_LIMIT FLUENTD_GCP_CPU_REQUE
PROMETHEUS_TO_SD_ENDPOINT
=
"
${
PROMETHEUS_TO_SD_ENDPOINT
:-
https
://monitoring.googleapis.com/
}
"
PROMETHEUS_TO_SD_ENDPOINT
=
"
${
PROMETHEUS_TO_SD_ENDPOINT
:-
https
://monitoring.googleapis.com/
}
"
PROMETHEUS_TO_SD_PREFIX
=
"
${
PROMETHEUS_TO_SD_PREFIX
:-
custom
.googleapis.com
}
"
PROMETHEUS_TO_SD_PREFIX
=
"
${
PROMETHEUS_TO_SD_PREFIX
:-
custom
.googleapis.com
}
"
ENABLE_PROMETHEUS_TO_SD
=
"
${
ENABLE_PROMETHEUS_TO_SD
:-
true
}
"
ENABLE_PROMETHEUS_TO_SD
=
"
${
ENABLE_PROMETHEUS_TO_SD
:-
true
}
"
# TODO(#51292): Make kube-proxy Daemonset default and remove the configuration here.
# Optional: Run kube-proxy as a DaemonSet if set to true, run as static pods otherwise.
KUBE_PROXY_DAEMONSET
=
"
${
KUBE_PROXY_DAEMONSET
:-
false
}
"
# true, false
cluster/gce/configure-vm.sh
View file @
1102656c
...
@@ -448,6 +448,7 @@ initial_etcd_cluster_state: '$(echo "${INITIAL_ETCD_CLUSTER_STATE:-}" | sed -e "
...
@@ -448,6 +448,7 @@ initial_etcd_cluster_state: '$(echo "${INITIAL_ETCD_CLUSTER_STATE:-}" | sed -e "
ca_cert_bundle_path: '
$(
echo
"
${
CA_CERT_BUNDLE_PATH
:-}
"
|
sed
-e
"s/'/''/g"
)
'
ca_cert_bundle_path: '
$(
echo
"
${
CA_CERT_BUNDLE_PATH
:-}
"
|
sed
-e
"s/'/''/g"
)
'
hostname:
$(
hostname
-s
)
hostname:
$(
hostname
-s
)
enable_default_storage_class: '
$(
echo
"
$ENABLE_DEFAULT_STORAGE_CLASS
"
|
sed
-e
"s/'/''/g"
)
'
enable_default_storage_class: '
$(
echo
"
$ENABLE_DEFAULT_STORAGE_CLASS
"
|
sed
-e
"s/'/''/g"
)
'
kube_proxy_daemonset: '
$(
echo
"
$KUBE_PROXY_DAEMONSET
"
|
sed
-e
"s/'/''/g"
)
'
EOF
EOF
if
[
-n
"
${
STORAGE_BACKEND
:-}
"
]
;
then
if
[
-n
"
${
STORAGE_BACKEND
:-}
"
]
;
then
cat
<<
EOF
>>/srv/salt-overlay/pillar/cluster-params.sls
cat
<<
EOF
>>/srv/salt-overlay/pillar/cluster-params.sls
...
...
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