Skip to content

Add etcd-quorum-guard #1597

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

Closed
RobertKrawitz wants to merge 2 commits into from
Closed

Add etcd-quorum-guard #1597

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4beb8e
Add etcd-quorum-guard
RobertKrawitz Apr 11, 2019
e92cf99
Remove etcd-quorum-guard from the bootstrap startup.
RobertKrawitz Apr 11, 2019
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
5 changes: 3 additions & 2 deletions data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ then
--machine-config-server-image=${MACHINE_CONFIG_SERVER_IMAGE} \
--machine-config-daemon-image=${MACHINE_CONFIG_DAEMON_IMAGE} \
--machine-config-oscontent-image=${MACHINE_CONFIG_OSCONTENT} \
--infra-image=${MACHINE_CONFIG_INFRA_IMAGE}
--infra-image=${MACHINE_CONFIG_INFRA_IMAGE} \
--etcd-quorum-guard-image=${MACHINE_CONFIG_ETCD_QUORUM_GUARD_IMAGE}

# Bootstrap MachineConfigController uses /etc/mcc/bootstrap/manifests/ dir to
# 1. read the controller config rendered by MachineConfigOperator
Expand Down Expand Up @@ -278,7 +279,7 @@ podman run \
--volume /etc/kubernetes:/etc/kubernetes:z \
--network=host \
"${CLUSTER_BOOTSTRAP_IMAGE}" \
start --asset-dir=/assets --required-pods="kube-apiserver:openshift-kube-apiserver/openshift-kube-apiserver|openshift-kube-apiserver/kube-apiserver,openshift-kube-scheduler/openshift-kube-scheduler,kube-controller-manager:openshift-kube-controller-manager/openshift-kube-controller-manager|openshift-kube-controller-manager/kube-controller-manager,openshift-cluster-version/cluster-version-operator"
start --asset-dir=/assets --required-pods="kube-apiserver:openshift-kube-apiserver/openshift-kube-apiserver|openshift-kube-apiserver/kube-apiserver,openshift-kube-scheduler/openshift-kube-scheduler,kube-controller-manager:openshift-kube-controller-manager/openshift-kube-controller-manager|openshift-kube-controller-manager/kube-controller-manager,openshift-cluster-version/cluster-version-operator,kube-system/etcd-quorum-guard"

# Workaround for https://github.com/opencontainers/runc/pull/1807
touch /opt/openshift/.bootkube.done
Expand Down