Skip to content

templates: change etcd-member to notify type #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Oct 2, 2018
Merged

templates: change etcd-member to notify type #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f0e93b
templates: reformat etcd-member
crawford Oct 1, 2018
ff9bc77
templates: change etcd-member to notify type
crawford Oct 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 33 additions & 31 deletions pkg/controller/template/test_data/templates/aws/master/units/etcd-member.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ contents: |
Wants=network-online.target

[Service]
Type=notify
Restart=on-failure
RestartSec=10s
TimeoutStartSec=0
Expand Down Expand Up @@ -61,37 +62,38 @@ contents: |
ExecStartPre=/usr/bin/chown etcd /var/lib/etcd
ExecStartPre=/usr/bin/chown etcd /run/etcd

ExecStart= /usr/bin/bash -c " \
/bin/podman \
run \
--rm \
--name etcd-member \
--volume /run/systemd/system:/run/systemd/system:ro,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--volume /etc/ssl/etcd:/etc/ssl/etcd:ro,z \
--volume /var/lib/etcd:/var/lib/etcd:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--env 'ETCD_NAME=%m' \
--env ETCD_DATA_DIR=/var/lib/etcd \
--network host \
--user=$(id --user etcd) \
'${ETCD_IMAGE}' \
/usr/local/bin/etcd \
--name=my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems \
--advertise-client-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2379 \
--cert-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--key-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--trusted-ca-file=/etc/ssl/etcd/ca.crt \
--client-cert-auth=true \
--peer-cert-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--peer-key-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
--peer-client-cert-auth=true \
--initial-cluster='my-test-cluster-etcd-0.installer.team.coreos.systems=https://my-test-cluster-etcd-0.installer.team.coreos.systems:2380,my-test-cluster-etcd-1.installer.team.coreos.systems=https://my-test-cluster-etcd-1.installer.team.coreos.systems:2380,my-test-cluster-etcd-2.installer.team.coreos.systems=https://my-test-cluster-etcd-2.installer.team.coreos.systems:2380' \
--initial-advertise-peer-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2380 \
--listen-client-urls=https://0.0.0.0:2379 \
--listen-peer-urls=https://0.0.0.0:2380 \
"
ExecStart=/usr/bin/bash -c " \
/bin/podman \
run \
--rm \
--name etcd-member \
--volume /run/systemd/system:/run/systemd/system:ro,z \
--volume /run/systemd/notify:/run/systemd/notify:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--volume /etc/ssl/etcd:/etc/ssl/etcd:ro,z \
--volume /var/lib/etcd:/var/lib/etcd:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--env 'ETCD_NAME=%m' \
--env ETCD_DATA_DIR=/var/lib/etcd \
--network host \
--user=$(id --user etcd) \
'${ETCD_IMAGE}' \
/usr/local/bin/etcd \
--name=my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems \
--advertise-client-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2379 \
--cert-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--key-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--trusted-ca-file=/etc/ssl/etcd/ca.crt \
--client-cert-auth=true \
--peer-cert-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--peer-key-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
--peer-client-cert-auth=true \
--initial-cluster='my-test-cluster-etcd-0.installer.team.coreos.systems=https://my-test-cluster-etcd-0.installer.team.coreos.systems:2380,my-test-cluster-etcd-1.installer.team.coreos.systems=https://my-test-cluster-etcd-1.installer.team.coreos.systems:2380,my-test-cluster-etcd-2.installer.team.coreos.systems=https://my-test-cluster-etcd-2.installer.team.coreos.systems:2380' \
--initial-advertise-peer-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2380 \
--listen-client-urls=https://0.0.0.0:2379 \
--listen-peer-urls=https://0.0.0.0:2380 \
"

[Install]
WantedBy=multi-user.target
Expand Down
64 changes: 33 additions & 31 deletions pkg/controller/template/test_data/templates/libvirt/master/units/etcd-member.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ contents: |
Wants=network-online.target

[Service]
Type=notify
Restart=on-failure
RestartSec=10s
TimeoutStartSec=0
Expand Down Expand Up @@ -61,37 +62,38 @@ contents: |
ExecStartPre=/usr/bin/chown etcd /var/lib/etcd
ExecStartPre=/usr/bin/chown etcd /run/etcd

ExecStart= /usr/bin/bash -c " \
/bin/podman \
run \
--rm \
--name etcd-member \
--volume /run/systemd/system:/run/systemd/system:ro,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--volume /etc/ssl/etcd:/etc/ssl/etcd:ro,z \
--volume /var/lib/etcd:/var/lib/etcd:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--env 'ETCD_NAME=%m' \
--env ETCD_DATA_DIR=/var/lib/etcd \
--network host \
--user=$(id --user etcd) \
'${ETCD_IMAGE}' \
/usr/local/bin/etcd \
--name=my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems \
--advertise-client-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2379 \
--cert-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--key-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--trusted-ca-file=/etc/ssl/etcd/ca.crt \
--client-cert-auth=true \
--peer-cert-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--peer-key-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
--peer-client-cert-auth=true \
--initial-cluster='my-test-cluster-etcd-0.installer.team.coreos.systems=https://my-test-cluster-etcd-0.installer.team.coreos.systems:2380,my-test-cluster-etcd-1.installer.team.coreos.systems=https://my-test-cluster-etcd-1.installer.team.coreos.systems:2380,my-test-cluster-etcd-2.installer.team.coreos.systems=https://my-test-cluster-etcd-2.installer.team.coreos.systems:2380' \
--initial-advertise-peer-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2380 \
--listen-client-urls=https://0.0.0.0:2379 \
--listen-peer-urls=https://0.0.0.0:2380 \
"
ExecStart=/usr/bin/bash -c " \
/bin/podman \
run \
--rm \
--name etcd-member \
--volume /run/systemd/system:/run/systemd/system:ro,z \
--volume /run/systemd/notify:/run/systemd/notify:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--volume /etc/ssl/etcd:/etc/ssl/etcd:ro,z \
--volume /var/lib/etcd:/var/lib/etcd:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--env 'ETCD_NAME=%m' \
--env ETCD_DATA_DIR=/var/lib/etcd \
--network host \
--user=$(id --user etcd) \
'${ETCD_IMAGE}' \
/usr/local/bin/etcd \
--name=my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems \
--advertise-client-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2379 \
--cert-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--key-file=/etc/ssl/etcd/system:etcd-server:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--trusted-ca-file=/etc/ssl/etcd/ca.crt \
--client-cert-auth=true \
--peer-cert-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.crt \
--peer-key-file=/etc/ssl/etcd/system:etcd-peer:my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems.key \
--peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
--peer-client-cert-auth=true \
--initial-cluster='my-test-cluster-etcd-0.installer.team.coreos.systems=https://my-test-cluster-etcd-0.installer.team.coreos.systems:2380,my-test-cluster-etcd-1.installer.team.coreos.systems=https://my-test-cluster-etcd-1.installer.team.coreos.systems:2380,my-test-cluster-etcd-2.installer.team.coreos.systems=https://my-test-cluster-etcd-2.installer.team.coreos.systems:2380' \
--initial-advertise-peer-urls=https://my-test-cluster-etcd-{{.etcd_index}}.installer.team.coreos.systems:2380 \
--listen-client-urls=https://0.0.0.0:2379 \
--listen-peer-urls=https://0.0.0.0:2380 \
"

[Install]
WantedBy=multi-user.target
Expand Down
64 changes: 33 additions & 31 deletions templates/_base/master/units/etcd-member.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ contents: |
Wants=network-online.target

[Service]
Type=notify
Restart=on-failure
RestartSec=10s
TimeoutStartSec=0
Expand Down Expand Up @@ -63,37 +64,38 @@ contents: |
ExecStartPre=/usr/bin/chown etcd /var/lib/etcd
ExecStartPre=/usr/bin/chown etcd /run/etcd

ExecStart= /usr/bin/bash -c " \
/bin/podman \
run \
--rm \
--name etcd-member \
--volume /run/systemd/system:/run/systemd/system:ro,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--volume /etc/ssl/etcd:/etc/ssl/etcd:ro,z \
--volume /var/lib/etcd:/var/lib/etcd:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--env 'ETCD_NAME=%m' \
--env ETCD_DATA_DIR=/var/lib/etcd \
--network host \
--user=$(id --user etcd) \
'${ETCD_IMAGE}' \
/usr/local/bin/etcd \
--name={{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}} \
--advertise-client-urls=https://{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}:2379 \
--cert-file=/etc/ssl/etcd/system:etcd-server:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.crt \
--key-file=/etc/ssl/etcd/system:etcd-server:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.key \
--trusted-ca-file=/etc/ssl/etcd/ca.crt \
--client-cert-auth=true \
--peer-cert-file=/etc/ssl/etcd/system:etcd-peer:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.crt \
--peer-key-file=/etc/ssl/etcd/system:etcd-peer:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.key \
--peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
--peer-client-cert-auth=true \
--initial-cluster='{{etcdInitialCluster .}}' \
--initial-advertise-peer-urls=https://{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}:2380 \
--listen-client-urls=https://0.0.0.0:2379 \
--listen-peer-urls=https://0.0.0.0:2380 \
"
ExecStart=/usr/bin/bash -c " \
/bin/podman \
run \
--rm \
--name etcd-member \
--volume /run/systemd/system:/run/systemd/system:ro,z \
--volume /run/systemd/notify:/run/systemd/notify:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--volume /etc/ssl/etcd:/etc/ssl/etcd:ro,z \
--volume /var/lib/etcd:/var/lib/etcd:rw,z \
--volume /etc/ssl/certs:/etc/ssl/certs:ro,z \
--env 'ETCD_NAME=%m' \
--env ETCD_DATA_DIR=/var/lib/etcd \
--network host \
--user=$(id --user etcd) \
'${ETCD_IMAGE}' \
/usr/local/bin/etcd \
--name={{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}} \
--advertise-client-urls=https://{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}:2379 \
--cert-file=/etc/ssl/etcd/system:etcd-server:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.crt \
--key-file=/etc/ssl/etcd/system:etcd-server:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.key \
--trusted-ca-file=/etc/ssl/etcd/ca.crt \
--client-cert-auth=true \
--peer-cert-file=/etc/ssl/etcd/system:etcd-peer:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.crt \
--peer-key-file=/etc/ssl/etcd/system:etcd-peer:{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}.key \
--peer-trusted-ca-file=/etc/ssl/etcd/ca.crt \
--peer-client-cert-auth=true \
--initial-cluster='{{etcdInitialCluster .}}' \
--initial-advertise-peer-urls=https://{{.ClusterName}}-etcd-{{skip "etcd_index"}}.{{.BaseDomain}}:2380 \
--listen-client-urls=https://0.0.0.0:2379 \
--listen-peer-urls=https://0.0.0.0:2380 \
"

[Install]
WantedBy=multi-user.target