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
6ced6491
Commit
6ced6491
authored
May 09, 2019
by
Matt Matejczyk
Committed by
Mateusz Matejczyk
May 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change etcd's --listen-client-urls to 0.0.0.0 in tests
This is to allow scraping etcd metrics in scalability tests. Ref.
https://github.com/kubernetes/perf-tests/issues/522
parent
b5336132
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
config-test.sh
cluster/gce/config-test.sh
+2
-0
configure-helper.sh
cluster/gce/gci/configure-helper.sh
+1
-0
etcd.manifest
cluster/gce/manifests/etcd.manifest
+1
-1
util.sh
cluster/gce/util.sh
+5
-0
No files found.
cluster/gce/config-test.sh
View file @
6ced6491
...
@@ -523,3 +523,5 @@ WINDOWS_NODE_TAINTS="${WINDOWS_NODE_TAINTS:-node.kubernetes.io/os=win1809:NoSche
...
@@ -523,3 +523,5 @@ WINDOWS_NODE_TAINTS="${WINDOWS_NODE_TAINTS:-node.kubernetes.io/os=win1809:NoSche
# Whether to set up a private GCE cluster, i.e. a cluster where nodes have only private IPs.
# Whether to set up a private GCE cluster, i.e. a cluster where nodes have only private IPs.
GCE_PRIVATE_CLUSTER
=
"
${
KUBE_GCE_PRIVATE_CLUSTER
:-
false
}
"
GCE_PRIVATE_CLUSTER
=
"
${
KUBE_GCE_PRIVATE_CLUSTER
:-
false
}
"
ETCD_LISTEN_CLIENT_IP
=
0.0.0.0
cluster/gce/gci/configure-helper.sh
View file @
6ced6491
...
@@ -1405,6 +1405,7 @@ function prepare-etcd-manifest {
...
@@ -1405,6 +1405,7 @@ function prepare-etcd-manifest {
sed
-i
-e
"s@{{ *host_ip *}}@
$host_ip
@g"
"
${
temp_file
}
"
sed
-i
-e
"s@{{ *host_ip *}}@
$host_ip
@g"
"
${
temp_file
}
"
sed
-i
-e
"s@{{ *etcd_cluster *}}@
$etcd_cluster
@g"
"
${
temp_file
}
"
sed
-i
-e
"s@{{ *etcd_cluster *}}@
$etcd_cluster
@g"
"
${
temp_file
}
"
sed
-i
-e
"s@{{ *liveness_probe_initial_delay *}}@
${
ETCD_LIVENESS_PROBE_INITIAL_DELAY_SEC
:-
15
}
@g"
"
${
temp_file
}
"
sed
-i
-e
"s@{{ *liveness_probe_initial_delay *}}@
${
ETCD_LIVENESS_PROBE_INITIAL_DELAY_SEC
:-
15
}
@g"
"
${
temp_file
}
"
sed
-i
-e
"s@{{ *listen_client_ip *}}@
${
ETCD_LISTEN_CLIENT_IP
:-
127
.0.0.1
}
@g"
"
${
temp_file
}
"
# Get default storage backend from manifest file.
# Get default storage backend from manifest file.
local
-r
default_storage_backend
=
$(
cat
"
${
temp_file
}
"
|
\
local
-r
default_storage_backend
=
$(
cat
"
${
temp_file
}
"
|
\
grep
-o
"{{ *pillar
\.
get('storage_backend', '
\(
.*
\)
') *}}"
|
\
grep
-o
"{{ *pillar
\.
get('storage_backend', '
\(
.*
\)
') *}}"
|
\
...
...
cluster/gce/manifests/etcd.manifest
View file @
6ced6491
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
"command": [
"command": [
"/bin/sh",
"/bin/sh",
"-c",
"-c",
"if [ -e /usr/local/bin/migrate-if-needed.sh ]; then /usr/local/bin/migrate-if-needed.sh 1>>/var/log/etcd{{ suffix }}.log 2>&1; fi; exec /usr/local/bin/etcd --name etcd-{{ hostname }} --listen-peer-urls {{ etcd_protocol }}://{{ host_ip }}:{{ server_port }} --initial-advertise-peer-urls {{ etcd_protocol }}://{{ hostname }}:{{ server_port }} --advertise-client-urls http://127.0.0.1:{{ port }} --listen-client-urls http://
127.0.0.1
:{{ port }} {{ quota_bytes }} --data-dir /var/etcd/data{{ suffix }} --initial-cluster-state {{ cluster_state }} --initial-cluster {{ etcd_cluster }} {{ etcd_creds }} {{ etcd_apiserver_creds }} {{ etcd_extra_args }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
"if [ -e /usr/local/bin/migrate-if-needed.sh ]; then /usr/local/bin/migrate-if-needed.sh 1>>/var/log/etcd{{ suffix }}.log 2>&1; fi; exec /usr/local/bin/etcd --name etcd-{{ hostname }} --listen-peer-urls {{ etcd_protocol }}://{{ host_ip }}:{{ server_port }} --initial-advertise-peer-urls {{ etcd_protocol }}://{{ hostname }}:{{ server_port }} --advertise-client-urls http://127.0.0.1:{{ port }} --listen-client-urls http://
{{ listen_client_ip }}
:{{ port }} {{ quota_bytes }} --data-dir /var/etcd/data{{ suffix }} --initial-cluster-state {{ cluster_state }} --initial-cluster {{ etcd_cluster }} {{ etcd_creds }} {{ etcd_apiserver_creds }} {{ etcd_extra_args }} 1>>/var/log/etcd{{ suffix }}.log 2>&1"
],
],
"env": [
"env": [
{ "name": "TARGET_STORAGE",
{ "name": "TARGET_STORAGE",
...
...
cluster/gce/util.sh
View file @
6ced6491
...
@@ -1407,6 +1407,11 @@ EOF
...
@@ -1407,6 +1407,11 @@ EOF
API_SERVER_TEST_LOG_LEVEL:
$(
yaml-quote
${
API_SERVER_TEST_LOG_LEVEL
})
API_SERVER_TEST_LOG_LEVEL:
$(
yaml-quote
${
API_SERVER_TEST_LOG_LEVEL
})
EOF
EOF
fi
fi
if
[
-n
"
${
ETCD_LISTEN_CLIENT_IP
:-}
"
]
;
then
cat
>>
$file
<<
EOF
ETCD_LISTEN_CLIENT_IP:
$(
yaml-quote
${
ETCD_LISTEN_CLIENT_IP
})
EOF
fi
else
else
# Node-only env vars.
# Node-only env vars.
...
...
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