openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Modified ova template name to use failure domain name

Browse Source
This commit is contained in:
vr4manta
2024-12-10 12:27:24 -05:00
parent 6fec4c858a
commit abbe10adff
11 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/asset/machines/clusterapi.go
View File

@@ -403,9 +403,8 @@ func (c *ClusterAPI) Generate(ctx context.Context, dependencies asset.Parents) e
}
pool.Platform.VSphere = &mpool
templateName := clusterID.InfraID + "-rhcos"
c.FileList, err = vspherecapi.GenerateMachines(ctx, clusterID.InfraID, ic, &pool, templateName, "master", installConfig.VSphere)
c.FileList, err = vspherecapi.GenerateMachines(ctx, clusterID.InfraID, ic, &pool, "master", installConfig.VSphere)
if err != nil {
return fmt.Errorf("unable to generate CAPI machines for vSphere %w", err)
}

3
pkg/asset/machines/master.go
View File

@@ -463,9 +463,8 @@ func (m *Master) Generate(ctx context.Context, dependencies asset.Parents) error
}
pool.Platform.VSphere = &mpool
templateName := clusterID.InfraID + "-rhcos"
data, err := vsphere.Machines(clusterID.InfraID, ic, &pool, templateName, "master", masterUserDataSecretName)
data, err := vsphere.Machines(clusterID.InfraID, ic, &pool, "master", masterUserDataSecretName)
if err != nil {
return errors.Wrap(err, "failed to create master machine objects")
}

4
pkg/asset/machines/vsphere/capimachines.go
View File

@@ -71,8 +71,8 @@ func getNetworkInventoryPath(vcenterContext vsphere.VCenterContext, networkName
}
// GenerateMachines returns a list of capi machines.
func GenerateMachines(ctx context.Context, clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage string, role string, metadata *vsphere.Metadata) ([]*asset.RuntimeFile, error) {
data, err := Machines(clusterID, config, pool, osImage, role, "")
func GenerateMachines(ctx context.Context, clusterID string, config *types.InstallConfig, pool *types.MachinePool, role string, metadata *vsphere.Metadata) ([]*asset.RuntimeFile, error) {
data, err := Machines(clusterID, config, pool, role, "")
if err != nil {
return nil, fmt.Errorf("unable to retrieve machines: %w", err)
}

5
pkg/asset/machines/vsphere/machines.go
View File

@@ -19,6 +19,7 @@ import (
machineapi "github.com/openshift/api/machine/v1beta1"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/vsphere"
"github.com/openshift/installer/pkg/utils"
)
// MachineData contains all result output from the Machines() function.
@@ -32,7 +33,7 @@ type MachineData struct {
}
// Machines returns a list of machines for a machinepool.
func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string) (*MachineData, error) {
func Machines(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role, userDataSecret string) (*MachineData, error) {
data := &MachineData{}
if configPlatform := config.Platform.Name(); configPlatform != vsphere.Name {
return data, fmt.Errorf("non vsphere configuration: %q", configPlatform)
@@ -107,7 +108,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
osImageForZone := failureDomain.Topology.Template
if failureDomain.Topology.Template == "" {
osImageForZone = fmt.Sprintf("%s-%s-%s", osImage, failureDomain.Region, failureDomain.Zone)
osImageForZone = utils.GenerateVSphereTemplateName(clusterID, failureDomain.Name)
}
vcenter, err := getVCenterFromServerName(failureDomain.Server, platform)

4
pkg/asset/machines/vsphere/machines_test.go
View File

@@ -413,7 +413,7 @@ func TestConfigMasters(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.testCase, func(t *testing.T) {
data, err := Machines(clusterID, tc.installConfig, tc.machinePool, "", "", "")
data, err := Machines(clusterID, tc.installConfig, tc.machinePool, "", "")
assertOnUnexpectedErrorState(t, tc.expectedError, err)
if len(tc.workspaces) > 0 {
@@ -492,7 +492,7 @@ func TestHostsToMachines(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.testCase, func(t *testing.T) {
data, err := Machines(clusterID, tc.installConfig, tc.machinePool, "", tc.role, "")
data, err := Machines(clusterID, tc.installConfig, tc.machinePool, tc.role, "")
assertOnUnexpectedErrorState(t, tc.expectedError, err)
// Check machine counts

5
pkg/asset/machines/vsphere/machinesets.go
View File

@@ -11,6 +11,7 @@ import (
machineapi "github.com/openshift/api/machine/v1beta1"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/vsphere"
"github.com/openshift/installer/pkg/utils"
)
func getMachineSetWithPlatform(
@@ -112,7 +113,7 @@ func getDefinedZonesFromTopology(p *vsphere.Platform) (map[string]vsphere.Failur
}
// MachineSets returns a list of machinesets for a machinepool.
func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, osImage, role, userDataSecret string) ([]*machineapi.MachineSet, error) {
func MachineSets(clusterID string, config *types.InstallConfig, pool *types.MachinePool, role, userDataSecret string) ([]*machineapi.MachineSet, error) {
if configPlatform := config.Platform.Name(); configPlatform != vsphere.Name {
return nil, fmt.Errorf("non vsphere configuration: %q", configPlatform)
}
@@ -162,7 +163,7 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach
osImageForZone := failureDomain.Topology.Template
if failureDomain.Topology.Template == "" {
osImageForZone = fmt.Sprintf("%s-%s-%s", osImage, failureDomain.Region, failureDomain.Zone)
osImageForZone = utils.GenerateVSphereTemplateName(clusterID, failureDomain.Name)
}
machineset, err := getMachineSetWithPlatform(
clusterID,

3
pkg/asset/machines/vsphere/machinesets_test.go
View File

@@ -97,7 +97,6 @@ var machineComputePoolUndefinedZones = types.MachinePool{
func TestConfigMachinesets(t *testing.T) {
clusterID := "test"
osImage := "test-cluster-xyzxyz-rhcos"
installConfig, err := parseInstallConfig()
if err != nil {
@@ -241,7 +240,7 @@ func TestConfigMachinesets(t *testing.T) {
}
for _, tc := range testCases {
t.Run(tc.testCase, func(t *testing.T) {
machineSets, err := MachineSets(clusterID, tc.installConfig, tc.machinePool, osImage, "", "")
machineSets, err := MachineSets(clusterID, tc.installConfig, tc.machinePool, "", "")
assertOnUnexpectedErrorState(t, tc.expectedError, err)
if len(tc.workspaces) > 0 {

6
pkg/asset/machines/worker.go
View File

@@ -583,9 +583,8 @@ func (w *Worker) Generate(ctx context.Context, dependencies asset.Parents) error
mpool.Set(ic.Platform.VSphere.DefaultMachinePlatform)
mpool.Set(pool.Platform.VSphere)
pool.Platform.VSphere = &mpool
templateName := clusterID.InfraID + "-rhcos"
sets, err := vsphere.MachineSets(clusterID.InfraID, ic, &pool, templateName, "worker", workerUserDataSecretName)
sets, err := vsphere.MachineSets(clusterID.InfraID, ic, &pool, "worker", workerUserDataSecretName)
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}
@@ -596,9 +595,8 @@ func (w *Worker) Generate(ctx context.Context, dependencies asset.Parents) error
// If static IPs are configured, we must generate worker machines and scale the machinesets to 0.
if ic.Platform.VSphere.Hosts != nil {
logrus.Debug("Generating worker machines with static IPs.")
templateName := clusterID.InfraID + "-rhcos"
data, err := vsphere.Machines(clusterID.InfraID, ic, &pool, templateName, "worker", workerUserDataSecretName)
data, err := vsphere.Machines(clusterID.InfraID, ic, &pool, "worker", workerUserDataSecretName)
if err != nil {
return errors.Wrap(err, "failed to create worker machine objects")
}

3
pkg/asset/manifests/vsphere/infrastructure.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/openshift/installer/pkg/asset/installconfig"
"github.com/openshift/installer/pkg/types"
"github.com/openshift/installer/pkg/types/vsphere"
"github.com/openshift/installer/pkg/utils"
)
// GetInfraPlatformSpec constructs VSpherePlatformSpec for the infrastructure spec
@@ -30,7 +31,7 @@ func GetInfraPlatformSpec(ic *installconfig.InstallConfig, clusterID string) *co
if topology.ComputeCluster != "" && topology.Networks[0] != "" {
template := topology.Template
if len(template) == 0 {
template = fmt.Sprintf("/%s/vm/%s-rhcos-%s-%s", topology.Datacenter, clusterID, failureDomain.Region, failureDomain.Zone)
template = fmt.Sprintf("/%s/vm/%s", topology.Datacenter, utils.GenerateVSphereTemplateName(clusterID, failureDomain.Name))
}
failureDomainSpec := configv1.VSpherePlatformFailureDomainSpec{

11
pkg/infrastructure/vsphere/clusterapi/import.go
View File

@@ -21,6 +21,7 @@ import (
"sigs.k8s.io/cluster-api-provider-vsphere/pkg/session"
"github.com/openshift/installer/pkg/types/vsphere"
"github.com/openshift/installer/pkg/utils"
)
func debugCorruptOva(cachedImage string, err error) error {
@@ -58,9 +59,17 @@ func checkOvaSecureBoot(ovfEnvelope *ovf.Envelope) bool {
}
func importRhcosOva(ctx context.Context, session *session.Session, folder *object.Folder, cachedImage, clusterID, tagID, diskProvisioningType string, failureDomain vsphere.FailureDomain) error {
name := fmt.Sprintf("%s-rhcos-%s-%s", clusterID, failureDomain.Region, failureDomain.Zone)
// Name originally was cluster id + fd.region + fd.zone. This could cause length of ova to be longer than max allowed.
// So for now, we are going to make cluster id + fd.name
name := utils.GenerateVSphereTemplateName(clusterID, failureDomain.Name)
logrus.Infof("Importing OVA %v into failure domain %v.", name, failureDomain.Name)
// OVA name must not exceed 80 characters
if len(name) > 80 {
logrus.Warningf("Unable to generate ova template name due to exceeding 80 characters. Cluster=\"%v\" Failure Domain=\"%v\" results in \"%v\"", clusterID, failureDomain.Name, name)
return fmt.Errorf("ova name \"%v\" exceeed 80 characters (%d)", name, len(name))
}
archive := &importer.TapeArchive{Path: cachedImage}
ovfDescriptor, err := importer.ReadOvf("*.ovf", archive)

5
pkg/utils/vmware.go
View File

@@ -116,3 +116,8 @@ func ConstructKargsFromNetworkConfig(ipAddrs []string, nameservers []string, gat
logrus.Debugf("Generated karg: [%v].", outKargs)
return outKargs, nil
}
// GenerateVSphereTemplateName returns expected template name.
func GenerateVSphereTemplateName(clusterID, fdName string) string {
return fmt.Sprintf("%s-rhcos-%s", clusterID, fdName)
}