Skip to content

Commit

Permalink
Add infra-image flag to bootstrap.go as no-op
Browse files Browse the repository at this point in the history
Adding this, so we can get the installer PR in first
before landing in openshift#471.
This is from an approved and lgtm'ed PR openshift#471.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
  • Loading branch information
umohnani8 committed Feb 25, 2019
1 parent 17c4ed0 commit fecb35b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions cmd/machine-config-operator/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ var (
mcdImage string
etcdImage string
setupEtcdEnvImage string
infraImage string
destinationDir string
}
)
Expand All @@ -62,6 +63,7 @@ func init() {
bootstrapCmd.MarkFlagRequired("etcd-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.setupEtcdEnvImage, "setup-etcd-env-image", "", "Image for Setup Etcd Environment.")
bootstrapCmd.MarkFlagRequired("setup-etcd-env-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.infraImage, "infra-image", "quay.io/openshift/origin-pod:v4.0", "Image for Infra Containers.")
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

0 comments on commit fecb35b

Please sign in to comment.