Skip to content

Move variables to constants #834

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
Dec 11, 2018
Merged

Move variables to constants #834

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
11 changes: 7 additions & 4 deletions pkg/asset/ignition/bootstrap/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ const (
rootDir = "/opt/openshift"
defaultReleaseImage = "registry.svc.ci.openshift.org/openshift/origin-release:v4.0"
bootstrapIgnFilename = "bootstrap.ign"
etcdCertSignerImage = "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6"
etcdctlImage = "quay.io/coreos/etcd:v3.2.14"
ignitionUser = "core"
)

// bootstrapTemplateData is the data to use to replace values in bootstrap
Expand Down Expand Up @@ -147,8 +150,8 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig, adminKub
}

return &bootstrapTemplateData{
EtcdCertSignerImage: "quay.io/coreos/kube-etcd-signer-server:678cc8e6841e2121ebfdb6e2db568fce290b67d6",
EtcdctlImage: "quay.io/coreos/etcd:v3.2.14",
EtcdCertSignerImage: etcdCertSignerImage,
EtcdctlImage: etcdctlImage,
PullSecret: installConfig.PullSecret,
ReleaseImage: releaseImage,
EtcdCluster: strings.Join(etcdEndpoints, ","),
Expand Down Expand Up @@ -205,8 +208,8 @@ func (a *Bootstrap) addStorageFiles(base string, uri string, templateData *boots
}
ign := ignition.FileFromBytes(strings.TrimSuffix(base, ".template"), mode, data)
if filename == ".bash_history" {
ign.User = &igntypes.NodeUser{Name: "core"}
ign.Group = &igntypes.NodeGroup{Name: "core"}
ign.User = &igntypes.NodeUser{Name: ignitionUser}
ign.Group = &igntypes.NodeGroup{Name: ignitionUser}

@wking wking Dec 7, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Overloading, mumble, mumble. But I'm fine adding an ignitionGroup later if we end up needing it.

}
ign.Append = appendToFile
a.Config.Storage.Files = append(a.Config.Storage.Files, ign)
Expand Down