Skip to content

MCO: add etcd-quorum-guard image #633

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
runcom wants to merge 1 commit into from
Closed

MCO: add etcd-quorum-guard image #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cmd/machine-config-operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ var (
setupEtcdEnvImage string
infraImage string
kubeClientAgentImage string
etcdQuorumGuardImage string

@RobertKrawitz RobertKrawitz Apr 12, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already in #613

destinationDir string
}
)
Expand Down Expand Up @@ -70,6 +71,8 @@ func init() {
bootstrapCmd.MarkFlagRequired("kube-client-agent-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.infraImage, "infra-image", "", "Image for Infra Containers.")
bootstrapCmd.MarkFlagRequired("infra-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.etcdQuorumGuardImage, "etcd-quorum-guard-image", "registry.svc.ci.openshift.org/openshift/origin-v4.0:base", "Image for etcd Quorum Guard.")

@RobertKrawitz RobertKrawitz Apr 12, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already in #613 (including marking it required).

// TODO mark the above as required afterward in https://github.com/openshift/machine-config-operator/pull/613
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.configFile, "config-file", "", "ClusterConfig ConfigMap file.")
bootstrapCmd.MarkFlagRequired("config-file")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.infraConfigFile, "infra-config-file", "/assets/manifests/cluster-infrastructure-02-config.yml", "File containing infrastructure.config.openshift.io manifest.")
Expand Down
4 changes: 4 additions & 0 deletions install/image-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ spec:
from:
kind: DockerImage
name: quay.io/openshift/origin-pod:v4.0
- name: etcd-quorum-guard-image

@RobertKrawitz RobertKrawitz Apr 12, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added just now to #613.

from:
kind: DockerImage
name: registry.svc.ci.openshift.org/openshift/origin-v4.0:base
- name: setup-etcd-environment
from:
kind: DockerImage
Expand Down