Skip to content

*: set kube-client-agent-image flag as required #555

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 1 commit into from
Mar 19, 2019
Merged

*: set kube-client-agent-image flag as required #555

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
6 changes: 1 addition & 5 deletions cmd/machine-config-operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ func init() {
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.setupEtcdEnvImage, "setup-etcd-env-image", "", "Image for Setup etcd Environment.")
bootstrapCmd.MarkFlagRequired("setup-etcd-env-image")
bootstrapCmd.PersistentFlags().StringVar(&bootstrapOpts.kubeClientAgentImage, "kube-client-agent-image", "", "Image for Kube Client Agent.")
// TODO hexfusion: uncomment after flag is merged from installer.
// bootstrapCmd.MarkFlagRequired("kube-client-agent-image")
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.configFile, "config-file", "", "ClusterConfig ConfigMap file.")
Expand All @@ -82,9 +81,6 @@ func runBootstrapCmd(cmd *cobra.Command, args []string) {
// To help debugging, immediately log version
glog.Infof("Version: %+v", version.Version)

// TODO hexfusion: uncomment after flag is merged from installer.
bootstrapOpts.kubeClientAgentImage = "registry.svc.ci.openshift.org/openshift/origin-v4.0:kube-client-agent"

imgs := operator.Images{
MachineConfigController: bootstrapOpts.mccImage,
MachineConfigDaemon: bootstrapOpts.mcdImage,
Expand Down
3 changes: 0 additions & 3 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,6 @@ func (optr *Operator) sync(key string) error {
return err
}

// TODO hexfusion: uncomment after flag is merged from installer.
imgs.KubeClientAgent = "registry.svc.ci.openshift.org/openshift/origin-v4.0:kube-client-agent"

spec.EtcdCAData = etcdCA
spec.RootCAData = bundle
spec.PullSecret = &v1.ObjectReference{Namespace: "kube-system", Name: "coreos-pull-secret"}
Expand Down