Skip to content

Commit

Permalink
Merge pull request #3730 from runcom/userdata-managed
Browse files Browse the repository at this point in the history 
Have the MCO manage the ignition stub config
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Aug 1, 2020
2 parents 8eded02 + 8d278d2 commit 2f8b52e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions pkg/asset/machines/master.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
subnets,
pool,
"master",
"master-user-data",
"master-user-data-managed",
installConfig.Config.Platform.AWS.UserTags,
)
if err != nil {
Expand All @@ -216,7 +216,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
mpool.Zones = azs
}
pool.Platform.GCP = &mpool
machines, err = gcp.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data")
machines, err = gcp.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create master machine objects")
}
Expand All @@ -226,7 +226,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
mpool.Set(ic.Platform.Libvirt.DefaultMachinePlatform)
mpool.Set(pool.Platform.Libvirt)
pool.Platform.Libvirt = &mpool
machines, err = libvirt.Machines(clusterID.InfraID, ic, pool, "master", "master-user-data")
machines, err = libvirt.Machines(clusterID.InfraID, ic, pool, "master", "master-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create master machine objects")
}
Expand All @@ -238,7 +238,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {

imageName, _ := rhcosutils.GenerateOpenStackImageName(string(*rhcosImage), clusterID.InfraID)

machines, err = openstack.Machines(clusterID.InfraID, ic, pool, imageName, "master", "master-user-data")
machines, err = openstack.Machines(clusterID.InfraID, ic, pool, imageName, "master", "master-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create master machine objects")
}
Expand Down Expand Up @@ -268,7 +268,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {

pool.Platform.Azure = &mpool

machines, err = azure.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data")
machines, err = azure.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create master machine objects")
}
Expand All @@ -279,7 +279,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
mpool.Set(pool.Platform.BareMetal)
pool.Platform.BareMetal = &mpool

machines, err = baremetal.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data")
machines, err = baremetal.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create master machine objects")
}
Expand Down Expand Up @@ -331,7 +331,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {

imageName, _ := rhcosutils.GenerateOpenStackImageName(string(*rhcosImage), clusterID.InfraID)

machines, err = ovirt.Machines(clusterID.InfraID, ic, pool, imageName, "master", "master-user-data")
machines, err = ovirt.Machines(clusterID.InfraID, ic, pool, imageName, "master", "master-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create master machine objects for ovirt provider")
}
Expand All @@ -344,7 +344,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
pool.Platform.VSphere = &mpool
templateName := clusterID.InfraID + "-rhcos"

machines, err = vsphere.Machines(clusterID.InfraID, ic, pool, templateName, "master", "master-user-data")
machines, err = vsphere.Machines(clusterID.InfraID, ic, pool, templateName, "master", "master-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create master machine objects")
}
Expand All @@ -354,7 +354,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
return fmt.Errorf("invalid Platform")
}

data, err := userDataSecret("master-user-data", mign.File.Data)
data, err := userDataSecret("master-user-data-managed", mign.File.Data)
if err != nil {
return errors.Wrap(err, "failed to create user-data secret for master machines")
}
Expand Down
18 changes: 9 additions & 9 deletions pkg/asset/machines/worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
subnets,
&pool,
"worker",
"worker-user-data",
"worker-user-data-managed",
installConfig.Config.Platform.AWS.UserTags,
)
if err != nil {
Expand Down Expand Up @@ -293,7 +293,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
}

pool.Platform.Azure = &mpool
sets, err := azure.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data")
sets, err := azure.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
Expand All @@ -305,7 +305,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
mpool.Set(ic.Platform.BareMetal.DefaultMachinePlatform)
mpool.Set(pool.Platform.BareMetal)
pool.Platform.BareMetal = &mpool
sets, err := baremetal.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data")
sets, err := baremetal.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
Expand All @@ -324,7 +324,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
mpool.Zones = azs
}
pool.Platform.GCP = &mpool
sets, err := gcp.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data")
sets, err := gcp.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
Expand All @@ -336,7 +336,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
mpool.Set(ic.Platform.Libvirt.DefaultMachinePlatform)
mpool.Set(pool.Platform.Libvirt)
pool.Platform.Libvirt = &mpool
sets, err := libvirt.MachineSets(clusterID.InfraID, ic, &pool, "worker", "worker-user-data")
sets, err := libvirt.MachineSets(clusterID.InfraID, ic, &pool, "worker", "worker-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
Expand All @@ -351,7 +351,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {

imageName, _ := rhcosutils.GenerateOpenStackImageName(string(*rhcosImage), clusterID.InfraID)

sets, err := openstack.MachineSets(clusterID.InfraID, ic, &pool, imageName, "worker", "worker-user-data")
sets, err := openstack.MachineSets(clusterID.InfraID, ic, &pool, imageName, "worker", "worker-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
Expand All @@ -365,7 +365,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
pool.Platform.VSphere = &mpool
templateName := clusterID.InfraID + "-rhcos"

sets, err := vsphere.MachineSets(clusterID.InfraID, ic, &pool, templateName, "worker", "worker-user-data")
sets, err := vsphere.MachineSets(clusterID.InfraID, ic, &pool, templateName, "worker", "worker-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
Expand All @@ -380,7 +380,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {

imageName, _ := rhcosutils.GenerateOpenStackImageName(string(*rhcosImage), clusterID.InfraID)

sets, err := ovirt.MachineSets(clusterID.InfraID, ic, &pool, imageName, "worker", "worker-user-data")
sets, err := ovirt.MachineSets(clusterID.InfraID, ic, &pool, imageName, "worker", "worker-user-data-managed")
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects for ovirt provider")
}
Expand All @@ -393,7 +393,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error {
}
}

data, err := userDataSecret("worker-user-data", wign.File.Data)
data, err := userDataSecret("worker-user-data-managed", wign.File.Data)
if err != nil {
return errors.Wrap(err, "failed to create user-data secret for worker machines")
}
Expand Down

0 comments on commit 2f8b52e

Please sign in to comment.