From 3920ae4a6bbe0690b1b23c603220257abe69a664 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 29 Sep 2020 17:29:20 +0200 Subject: [PATCH] Revert "Have the MCO manage the ignition stub config" This reverts commit 8d278d258f9eb16788cc8c4bda842018e28625d7. --- pkg/asset/machines/master.go | 18 +++++++++--------- pkg/asset/machines/worker.go | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/asset/machines/master.go b/pkg/asset/machines/master.go index 98c3e2ab2d8..e4fbda0ee63 100644 --- a/pkg/asset/machines/master.go +++ b/pkg/asset/machines/master.go @@ -197,7 +197,7 @@ func (m *Master) Generate(dependencies asset.Parents) error { subnets, pool, "master", - "master-user-data-managed", + "master-user-data", installConfig.Config.Platform.AWS.UserTags, ) if err != nil { @@ -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-managed") + machines, err = gcp.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data") if err != nil { return errors.Wrap(err, "failed to create master machine objects") } @@ -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-managed") + machines, err = libvirt.Machines(clusterID.InfraID, ic, pool, "master", "master-user-data") if err != nil { return errors.Wrap(err, "failed to create master machine objects") } @@ -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-managed") + machines, err = openstack.Machines(clusterID.InfraID, ic, pool, imageName, "master", "master-user-data") if err != nil { return errors.Wrap(err, "failed to create master machine objects") } @@ -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-managed") + machines, err = azure.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data") if err != nil { return errors.Wrap(err, "failed to create master machine objects") } @@ -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-managed") + machines, err = baremetal.Machines(clusterID.InfraID, ic, pool, string(*rhcosImage), "master", "master-user-data") if err != nil { return errors.Wrap(err, "failed to create master machine objects") } @@ -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-managed") + machines, err = ovirt.Machines(clusterID.InfraID, ic, pool, imageName, "master", "master-user-data") if err != nil { return errors.Wrap(err, "failed to create master machine objects for ovirt provider") } @@ -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-managed") + machines, err = vsphere.Machines(clusterID.InfraID, ic, pool, templateName, "master", "master-user-data") if err != nil { return errors.Wrap(err, "failed to create master machine objects") } @@ -354,7 +354,7 @@ func (m *Master) Generate(dependencies asset.Parents) error { return fmt.Errorf("invalid Platform") } - data, err := userDataSecret("master-user-data-managed", mign.File.Data) + data, err := userDataSecret("master-user-data", mign.File.Data) if err != nil { return errors.Wrap(err, "failed to create user-data secret for master machines") } diff --git a/pkg/asset/machines/worker.go b/pkg/asset/machines/worker.go index 309cdb73b2d..a210413ace6 100644 --- a/pkg/asset/machines/worker.go +++ b/pkg/asset/machines/worker.go @@ -262,7 +262,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error { subnets, &pool, "worker", - "worker-user-data-managed", + "worker-user-data", installConfig.Config.Platform.AWS.UserTags, ) if err != nil { @@ -294,7 +294,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-managed") + sets, err := azure.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data") if err != nil { return errors.Wrap(err, "failed to create worker machine objects") } @@ -306,7 +306,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-managed") + sets, err := baremetal.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data") if err != nil { return errors.Wrap(err, "failed to create worker machine objects") } @@ -325,7 +325,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-managed") + sets, err := gcp.MachineSets(clusterID.InfraID, ic, &pool, string(*rhcosImage), "worker", "worker-user-data") if err != nil { return errors.Wrap(err, "failed to create worker machine objects") } @@ -337,7 +337,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-managed") + sets, err := libvirt.MachineSets(clusterID.InfraID, ic, &pool, "worker", "worker-user-data") if err != nil { return errors.Wrap(err, "failed to create worker machine objects") } @@ -352,7 +352,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-managed") + sets, err := openstack.MachineSets(clusterID.InfraID, ic, &pool, imageName, "worker", "worker-user-data") if err != nil { return errors.Wrap(err, "failed to create worker machine objects") } @@ -366,7 +366,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-managed") + sets, err := vsphere.MachineSets(clusterID.InfraID, ic, &pool, templateName, "worker", "worker-user-data") if err != nil { return errors.Wrap(err, "failed to create worker machine objects") } @@ -381,7 +381,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-managed") + sets, err := ovirt.MachineSets(clusterID.InfraID, ic, &pool, imageName, "worker", "worker-user-data") if err != nil { return errors.Wrap(err, "failed to create worker machine objects for ovirt provider") } @@ -394,7 +394,7 @@ func (w *Worker) Generate(dependencies asset.Parents) error { } } - data, err := userDataSecret("worker-user-data-managed", wign.File.Data) + data, err := userDataSecret("worker-user-data", wign.File.Data) if err != nil { return errors.Wrap(err, "failed to create user-data secret for worker machines") }