diff --git a/test/extended/machineosconfig.go b/test/extended/machineosconfig.go index 31a54214e9..7f75456cca 100644 --- a/test/extended/machineosconfig.go +++ b/test/extended/machineosconfig.go @@ -39,31 +39,31 @@ func NewMachineOSConfigList(oc *exutil.CLI) *MachineOSConfigList { } // CreateMachineOSConfig creates a MOSC resource using the information provided in the arguments -func CreateMachineOSConfig(oc *exutil.CLI, name, pool, baseImagePullSecret, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile) (*MachineOSConfig, error) { - return createMachineOSConfig(oc, name, pool, &baseImagePullSecret, renderedImagePushSecret, pushSpec, containerFile) +func CreateMachineOSConfig(oc *exutil.CLI, moscAndMcpName, baseImagePullSecret, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile) (*MachineOSConfig, error) { + return createMachineOSConfig(oc, moscAndMcpName, &baseImagePullSecret, renderedImagePushSecret, pushSpec, containerFile) } // CreateMachineOSConfigWithDefaultBasImagePullSecret creates a MOSC resource using the information provided in the arguments, it does not define the image pull secret -func CreateMachineOSConfigWithDefaultBasImagePullSecret(oc *exutil.CLI, name, pool, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile) (*MachineOSConfig, error) { - return createMachineOSConfig(oc, name, pool, nil, renderedImagePushSecret, pushSpec, containerFile) +func CreateMachineOSConfigWithDefaultBasImagePullSecret(oc *exutil.CLI, moscAndMcpName, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile) (*MachineOSConfig, error) { + return createMachineOSConfig(oc, moscAndMcpName, nil, renderedImagePushSecret, pushSpec, containerFile) } // createMachineOSConfig creates a MOSC resource using the information provided in the arguments -func createMachineOSConfig(oc *exutil.CLI, name, pool string, baseImagePullSecret *string, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile) (*MachineOSConfig, error) { +func createMachineOSConfig(oc *exutil.CLI, moscAndMcpName string, baseImagePullSecret *string, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile) (*MachineOSConfig, error) { var ( containerFilesString = "[]" moscTemplateFile = "generic-machine-os-config-nobaseimagepull.yaml" - parameters = []string{"-p", "NAME=" + name, "POOL=" + pool, + parameters = []string{"-p", "NAME=" + moscAndMcpName, "POOL=" + moscAndMcpName, "RENDEREDIMAGEPUSHSECRET=" + renderedImagePushSecret, "PUSHSPEC=" + pushSpec} ) if baseImagePullSecret != nil { moscTemplateFile = "generic-machine-os-config.yaml" parameters = append(parameters, "BASEIMAGEPULLSECRET="+*baseImagePullSecret) - logger.Infof("Creating MachineOSConfig %s in pool %s with pullSecret %s pushSecret %s and pushSpec %s", name, pool, *baseImagePullSecret, renderedImagePushSecret, pushSpec) + logger.Infof("Creating MachineOSConfig %s in pool %s with pullSecret %s pushSecret %s and pushSpec %s", moscAndMcpName, moscAndMcpName, *baseImagePullSecret, renderedImagePushSecret, pushSpec) } else { - logger.Infof("Creating MachineOSConfig %s in pool %s with default pullSecret pushSecret %s and pushSpec %s", name, pool, renderedImagePushSecret, pushSpec) + logger.Infof("Creating MachineOSConfig %s in pool %s with default pullSecret pushSecret %s and pushSpec %s", moscAndMcpName, moscAndMcpName, renderedImagePushSecret, pushSpec) } - newMOSC := NewMachineOSConfig(oc, name) + newMOSC := NewMachineOSConfig(oc, moscAndMcpName) if len(containerFile) > 0 { containerFilesBytes, err := json.Marshal(containerFile) @@ -103,15 +103,15 @@ func CopySecretToMCONamespace(secret *Secret, newName string) (*Secret, error) { return &Secret{Resource: *mcoResource}, nil } -func CreateMachineOSConfigUsingInternalRegistry(oc *exutil.CLI, namespace, name, pool string, containerFile []ContainerFile, defaultPullSecret bool) (*MachineOSConfig, error) { +func CreateMachineOSConfigUsingInternalRegistry(oc *exutil.CLI, namespace, moscAndMcpName string, containerFile []ContainerFile, defaultPullSecret bool) (*MachineOSConfig, error) { // We use the builder SA secret in the namespace to push the images to the internal registry renderedImagePushSecret, err := CreateInternalRegistrySecretFromSA(oc, "builder", namespace, "cloned-push-secret"+exutil.GetRandomString(), MachineConfigNamespace) if err != nil { - return NewMachineOSConfig(oc, name), err + return NewMachineOSConfig(oc, moscAndMcpName), err } if !renderedImagePushSecret.Exists() { - return NewMachineOSConfig(oc, name), fmt.Errorf("Rendered image push secret does not exist: %s", renderedImagePushSecret) + return NewMachineOSConfig(oc, moscAndMcpName), fmt.Errorf("Rendered image push secret does not exist: %s", renderedImagePushSecret) } if namespace != MachineConfigNamespace { // If the secret is not in MCO, we copy it there @@ -120,31 +120,31 @@ func CreateMachineOSConfigUsingInternalRegistry(oc *exutil.CLI, namespace, name, // We use the default SA secret in MCO to pull the current image from the internal registry namespacedPullSecret, err := CreateInternalRegistrySecretFromSA(oc, "default", namespace, "cloned-currentpull-secret"+exutil.GetRandomString(), namespace) if err != nil { - return NewMachineOSConfig(oc, name), err + return NewMachineOSConfig(oc, moscAndMcpName), err } if !namespacedPullSecret.Exists() { - return NewMachineOSConfig(oc, name), fmt.Errorf("Current image pull secret does not exist: %s", namespacedPullSecret) + return NewMachineOSConfig(oc, moscAndMcpName), fmt.Errorf("Current image pull secret does not exist: %s", namespacedPullSecret) } namespacedDockerConfig, err := namespacedPullSecret.GetDataValue(".dockerconfigjson") if err != nil { - return NewMachineOSConfig(oc, name), fmt.Errorf("Could not extract dockerConfig from the namespaced pull secret") + return NewMachineOSConfig(oc, moscAndMcpName), fmt.Errorf("Could not extract dockerConfig from the namespaced pull secret") } pullSecret := GetPullSecret(oc.AsAdmin()) pullSecretDockerConfig, err := pullSecret.GetDataValue(".dockerconfigjson") if err != nil { - return NewMachineOSConfig(oc, name), fmt.Errorf("Could not extract dockerConfig from the cluster's pull secret") + return NewMachineOSConfig(oc, moscAndMcpName), fmt.Errorf("Could not extract dockerConfig from the cluster's pull secret") } mergedDockerConfig, err := MergeDockerConfigs(pullSecretDockerConfig, namespacedDockerConfig) if err != nil { - return NewMachineOSConfig(oc, name), fmt.Errorf("Could not merge the namespaced pull-secret dockerconfig and the cluster's pull-secret docker config") + return NewMachineOSConfig(oc, moscAndMcpName), fmt.Errorf("Could not merge the namespaced pull-secret dockerconfig and the cluster's pull-secret docker config") } err = pullSecret.SetDataValue(".dockerconfigjson", mergedDockerConfig) if err != nil { - return NewMachineOSConfig(oc, name), fmt.Errorf("Could not configure the cluster's pull-secret with the merged dockerconfig") + return NewMachineOSConfig(oc, moscAndMcpName), fmt.Errorf("Could not configure the cluster's pull-secret with the merged dockerconfig") } logger.Infof("Waiting for the secret to be updated in all pools") @@ -152,39 +152,39 @@ func CreateMachineOSConfigUsingInternalRegistry(oc *exutil.CLI, namespace, name, } // We use a push spec stored in the internal registry in the MCO namespace. We use a different image for every pool - pushSpec := fmt.Sprintf("%s/%s/ocb-%s-image:latest", InternalRegistrySvcURL, namespace, pool) + pushSpec := fmt.Sprintf("%s/%s/ocb-%s-image:latest", InternalRegistrySvcURL, namespace, moscAndMcpName) if !defaultPullSecret { // We use a copy of the cluster's pull secret to pull the images pullSecret := NewSecret(oc.AsAdmin(), "openshift-config", "pull-secret") baseImagePullSecret, err := CopySecretToMCONamespace(pullSecret, "cloned-basepull-secret-"+exutil.GetRandomString()) if err != nil { - return NewMachineOSConfig(oc, name), err + return NewMachineOSConfig(oc, moscAndMcpName), err } - return CreateMachineOSConfig(oc, name, pool, baseImagePullSecret.GetName(), renderedImagePushSecret.GetName(), pushSpec, containerFile) + return CreateMachineOSConfig(oc, moscAndMcpName, baseImagePullSecret.GetName(), renderedImagePushSecret.GetName(), pushSpec, containerFile) } - return CreateMachineOSConfigWithDefaultBasImagePullSecret(oc, name, pool, renderedImagePushSecret.GetName(), pushSpec, containerFile) + return CreateMachineOSConfigWithDefaultBasImagePullSecret(oc, moscAndMcpName, renderedImagePushSecret.GetName(), pushSpec, containerFile) } // CreateMachineOSConfigUsingExternalRegistry creates a new MOSC resource using the mcoqe external registry. The credentials to pull and push images in the mcoqe repo should be previously added to the cluster's pull secret -func CreateMachineOSConfigUsingExternalRegistry(oc *exutil.CLI, name, pool string, containerFile []ContainerFile, defaultPullSecret, expireImage bool) (*MachineOSConfig, error) { +func CreateMachineOSConfigUsingExternalRegistry(oc *exutil.CLI, moscAndMcpName string, containerFile []ContainerFile, defaultPullSecret, expireImage bool) (*MachineOSConfig, error) { var ( // We use a copy of the cluster's pull secret to pull the images pullSecret = NewSecret(oc.AsAdmin(), "openshift-config", "pull-secret") ) copyPullSecret, err := CopySecretToMCONamespace(pullSecret, "cloned-pull-secret-"+exutil.GetRandomString()) if err != nil { - return NewMachineOSConfig(oc, name), err + return NewMachineOSConfig(oc, moscAndMcpName), err } clusterName, err := exutil.GetInfraID(oc) if err != nil { - return NewMachineOSConfig(oc, name), err + return NewMachineOSConfig(oc, moscAndMcpName), err } // We use a push spec stored in the internal registry in the MCO namespace. We use a different image for every pool - pushSpec := fmt.Sprintf("%s:ocb-%s-%s", DefaultLayeringQuayRepository, pool, clusterName) + pushSpec := fmt.Sprintf("%s:ocb-%s-%s", DefaultLayeringQuayRepository, moscAndMcpName, clusterName) // If we use the external registry we need to add an expiration date label so that the images are automatically cleaned configuredContainerFile := []ContainerFile{} @@ -201,31 +201,31 @@ func CreateMachineOSConfigUsingExternalRegistry(oc *exutil.CLI, name, pool strin } if defaultPullSecret { - return CreateMachineOSConfigWithDefaultBasImagePullSecret(oc, name, pool, copyPullSecret.GetName(), pushSpec, configuredContainerFile) + return CreateMachineOSConfigWithDefaultBasImagePullSecret(oc, moscAndMcpName, copyPullSecret.GetName(), pushSpec, configuredContainerFile) } - return CreateMachineOSConfig(oc, name, pool, copyPullSecret.GetName(), copyPullSecret.GetName(), pushSpec, configuredContainerFile) + return CreateMachineOSConfig(oc, moscAndMcpName, copyPullSecret.GetName(), copyPullSecret.GetName(), pushSpec, configuredContainerFile) } // CreateMachineOSConfigUsingExternalOrInternalRegistry creates a MOSC using internal registry if possible, if not possible it will use external registry. It will define the BaseImagePullSecret too -func CreateMachineOSConfigUsingExternalOrInternalRegistry(oc *exutil.CLI, namespace, name, pool string, containerFile []ContainerFile) (*MachineOSConfig, error) { +func CreateMachineOSConfigUsingExternalOrInternalRegistry(oc *exutil.CLI, namespace, moscAndMcpName string, containerFile []ContainerFile) (*MachineOSConfig, error) { var ( // When we create a new MOSC using the external registry we add an expiration label so that they are directly pruned by quay expireImage = true // We configure the pull secret in the MOSC resource even if it is only optional defaultPullSecret = false ) - return createMachineOSConfigUsingExternalOrInternalRegistry(oc, namespace, name, pool, containerFile, defaultPullSecret, expireImage) + return createMachineOSConfigUsingExternalOrInternalRegistry(oc, namespace, moscAndMcpName, containerFile, defaultPullSecret, expireImage) } // createMachineOSConfigUsingExternalOrInternalRegistry creates a MOSC using internal registry if possible, if not possible it will use external registry -func createMachineOSConfigUsingExternalOrInternalRegistry(oc *exutil.CLI, namespace, name, pool string, containerFile []ContainerFile, defaultPullSecret, expireImage bool) (*MachineOSConfig, error) { +func createMachineOSConfigUsingExternalOrInternalRegistry(oc *exutil.CLI, namespace, moscAndMcpName string, containerFile []ContainerFile, defaultPullSecret, expireImage bool) (*MachineOSConfig, error) { if CanUseInternalRegistryToStoreOSImage(oc) { - return CreateMachineOSConfigUsingInternalRegistry(oc, namespace, name, pool, containerFile, defaultPullSecret) + return CreateMachineOSConfigUsingInternalRegistry(oc, namespace, moscAndMcpName, containerFile, defaultPullSecret) } - return CreateMachineOSConfigUsingExternalRegistry(oc, name, pool, containerFile, defaultPullSecret, expireImage) + return CreateMachineOSConfigUsingExternalRegistry(oc, moscAndMcpName, containerFile, defaultPullSecret, expireImage) } diff --git a/test/extended/mco_ocb.go b/test/extended/mco_ocb.go index aa45447448..38916f400a 100644 --- a/test/extended/mco_ocb.go +++ b/test/extended/mco_ocb.go @@ -24,19 +24,18 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive g.It("PolarionID:83141-A valid MachineOSConfig leads to a successful MachineOSBuild and cleanup of its associated resources", func() { var ( - infraMcpName = "infra" - moscName = fmt.Sprintf("tc-%s-infra", GetCurrentTestPolarionIDNumber()) + moscAndMcpName = "infra" ) exutil.By("Create custom infra MCP") // We add no workers to the infra pool, it is not necessary - infraMcp, err := CreateCustomMCP(oc.AsAdmin(), infraMcpName, 0) + infraMcp, err := CreateCustomMCP(oc.AsAdmin(), moscAndMcpName, 0) defer infraMcp.delete() - o.Expect(err).NotTo(o.HaveOccurred(), "Error creating a new custom pool: %s", infraMcpName) + o.Expect(err).NotTo(o.HaveOccurred(), "Error creating a new custom pool: %s", moscAndMcpName) logger.Infof("OK!\n") exutil.By("Configure OCB functionality for the new infra MCP") - mosc, err := CreateMachineOSConfigUsingExternalOrInternalRegistry(oc.AsAdmin(), MachineConfigNamespace, moscName, infraMcpName, nil) + mosc, err := CreateMachineOSConfigUsingExternalOrInternalRegistry(oc.AsAdmin(), MachineConfigNamespace, moscAndMcpName, nil) defer mosc.CleanupAndDelete() o.Expect(err).NotTo(o.HaveOccurred(), "Error creating the MachineOSConfig resource") logger.Infof("OK!\n") @@ -56,17 +55,16 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive g.It("PolarionID:83138-A MachineOSConfig fails to apply or degrades if invalid inputs are given", func() { var ( - infraMcpName = "infra" - moscName = fmt.Sprintf("tc-%s-infra", GetCurrentTestPolarionIDNumber()) - pushSpec = fmt.Sprintf("%s/openshift-machine-config-operator/ocb-%s-image:latest", InternalRegistrySvcURL, infraMcpName) - pullSecret = NewSecret(oc.AsAdmin(), "openshift-config", "pull-secret") + moscAndMcpName = "infra" + pushSpec = fmt.Sprintf("%s/openshift-machine-config-operator/ocb-%s-image:latest", InternalRegistrySvcURL, moscAndMcpName) + pullSecret = NewSecret(oc.AsAdmin(), "openshift-config", "pull-secret") fakePullSecretName = "fake-pull-secret" expectedWrongPullSecretMsg = fmt.Sprintf(`could not validate baseImagePullSecret "%s" for MachineOSConfig %s: secret %s from %s is not found. Did you use the right secret name?`, - fakePullSecretName, moscName, fakePullSecretName, moscName) + fakePullSecretName, moscAndMcpName, fakePullSecretName, moscAndMcpName) fakePushSecretName = "fake-push-secret" expectedWrongPushSecretMsg = fmt.Sprintf(`could not validate renderedImagePushSecret "%s" for MachineOSConfig %s: secret %s from %s is not found. Did you use the right secret name?`, - fakePushSecretName, moscName, fakePushSecretName, moscName) + fakePushSecretName, moscAndMcpName, fakePushSecretName, moscAndMcpName) fakeBuilderType = "FakeBuilderType" expectedWrongBuilderTypeMsg = fmt.Sprintf(`Unsupported value: "%s": supported values: "Job"`, fakeBuilderType) @@ -74,9 +72,9 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive exutil.By("Create custom infra MCP") // We add no workers to the infra pool, it is not necessary - infraMcp, err := CreateCustomMCP(oc.AsAdmin(), infraMcpName, 0) + infraMcp, err := CreateCustomMCP(oc.AsAdmin(), moscAndMcpName, 0) defer infraMcp.delete() - o.Expect(err).NotTo(o.HaveOccurred(), "Error creating a new custom pool: %s", infraMcpName) + o.Expect(err).NotTo(o.HaveOccurred(), "Error creating a new custom pool: %s", moscAndMcpName) logger.Infof("OK!\n") exutil.By("Clone the pull-secret in MCO namespace") @@ -86,19 +84,19 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive logger.Infof("OK!\n") // Check behaviour when wrong pullSecret - checkMisconfiguredMOSC(oc.AsAdmin(), moscName, infraMcpName, fakePullSecretName, clonedSecret.GetName(), pushSpec, nil, + checkMisconfiguredMOSC(oc.AsAdmin(), moscAndMcpName, fakePullSecretName, clonedSecret.GetName(), pushSpec, nil, expectedWrongPullSecretMsg, "Check that MOSC using wrong pull secret are failing as expected") // Check behaviour when wrong pushSecret - checkMisconfiguredMOSC(oc.AsAdmin(), moscName, infraMcpName, clonedSecret.GetName(), fakePushSecretName, pushSpec, nil, + checkMisconfiguredMOSC(oc.AsAdmin(), moscAndMcpName, clonedSecret.GetName(), fakePushSecretName, pushSpec, nil, expectedWrongPushSecretMsg, "Check that MOSC using wrong push secret are failing as expected") // Try to create a MOSC with a wrong pushSpec logger.Infof("Create a MachineOSConfig resource with a wrong builder type") - err = NewMCOTemplate(oc, "generic-machine-os-config.yaml").Create("-p", "NAME="+moscName, "POOL="+infraMcpName, "PULLSECRET="+clonedSecret.GetName(), + err = NewMCOTemplate(oc, "generic-machine-os-config.yaml").Create("-p", "NAME="+moscAndMcpName, "POOL="+moscAndMcpName, "PULLSECRET="+clonedSecret.GetName(), "PUSHSECRET="+clonedSecret.GetName(), "PUSHSPEC="+pushSpec, "IMAGEBUILDERTYPE="+fakeBuilderType) o.Expect(err).To(o.HaveOccurred(), "Expected oc command to fail, but it didn't") o.Expect(err).To(o.BeAssignableToTypeOf(&exutil.ExitError{}), "Unexpected error while creating the new MOSC") @@ -150,12 +148,11 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive g.It("PolarionID:77781-A successfully built MachineOSConfig can be re-build", func() { var ( - mcp = GetCompactCompatiblePool(oc.AsAdmin()) - moscName = "test-" + mcp.GetName() + "-" + GetCurrentTestPolarionIDNumber() + mcp = GetCompactCompatiblePool(oc.AsAdmin()) ) exutil.By("Configure OCB functionality for the new worker MCP") - mosc, err := CreateMachineOSConfigUsingExternalOrInternalRegistry(oc.AsAdmin(), MachineConfigNamespace, moscName, mcp.GetName(), nil) + mosc, err := CreateMachineOSConfigUsingExternalOrInternalRegistry(oc.AsAdmin(), MachineConfigNamespace, mcp.GetName(), nil) defer DisableOCL(mosc) o.Expect(err).NotTo(o.HaveOccurred(), "Error creating the MachineOSConfig resource") logger.Infof("OK!\n") @@ -173,12 +170,11 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive g.It("PolarionID:77782-A MachineOSConfig with an unfinished build can be re-build", func() { var ( - mcp = GetCompactCompatiblePool(oc.AsAdmin()) - moscName = "test-" + mcp.GetName() + "-" + GetCurrentTestPolarionIDNumber() + mcp = GetCompactCompatiblePool(oc.AsAdmin()) ) exutil.By("Configure OCB functionality for the new worker MCP") - mosc, err := CreateMachineOSConfigUsingExternalOrInternalRegistry(oc.AsAdmin(), MachineConfigNamespace, moscName, mcp.GetName(), nil) + mosc, err := CreateMachineOSConfigUsingExternalOrInternalRegistry(oc.AsAdmin(), MachineConfigNamespace, mcp.GetName(), nil) defer DisableOCL(mosc) o.Expect(err).NotTo(o.HaveOccurred(), "Error creating the MachineOSConfig resource") logger.Infof("OK!\n") @@ -223,18 +219,17 @@ var _ = g.Describe("[sig-mco][Suite:openshift/machine-config-operator/disruptive func testContainerFile(containerFiles []ContainerFile, imageNamespace string, mcp *MachineConfigPool, checkers []Checker, defaultPullSecret bool) { var ( - oc = mcp.GetOC().AsAdmin() - mcpList = NewMachineConfigPoolList(oc.AsAdmin()) - moscName = "test-" + GetCurrentTestPolarionIDNumber() - mosc *MachineOSConfig - err error + oc = mcp.GetOC().AsAdmin() + mcpList = NewMachineConfigPoolList(oc.AsAdmin()) + mosc *MachineOSConfig + err error // If we use the internal registry we configure the MOSC with a container file labeling an expiration date so that it is automatically pruned by quay expireImage = true ) switch imageNamespace { case MachineConfigNamespace: exutil.By("Configure OCB functionality for the new infra MCP. Create MOSC") - mosc, err = createMachineOSConfigUsingExternalOrInternalRegistry(oc, MachineConfigNamespace, moscName, mcp.GetName(), containerFiles, defaultPullSecret, expireImage) + mosc, err = createMachineOSConfigUsingExternalOrInternalRegistry(oc, MachineConfigNamespace, mcp.GetName(), containerFiles, defaultPullSecret, expireImage) default: SkipTestIfCannotUseInternalRegistry(mcp.GetOC()) @@ -264,7 +259,7 @@ func testContainerFile(containerFiles []ContainerFile, imageNamespace string, mc logger.Infof("OK!\n") exutil.By("Configure OCB functionality for the new infra MCP. Create MOSC") - mosc, err = CreateMachineOSConfigUsingInternalRegistry(oc, tmpNamespace.GetName(), moscName, mcp.GetName(), containerFiles, defaultPullSecret) + mosc, err = CreateMachineOSConfigUsingInternalRegistry(oc, tmpNamespace.GetName(), mcp.GetName(), containerFiles, defaultPullSecret) } defer DisableOCL(mosc) o.Expect(err).NotTo(o.HaveOccurred(), "Error creating the MachineOSConfig resource") @@ -463,7 +458,7 @@ func ValidateMOSCIsGarbageCollected(mosc *MachineOSConfig, mcp *MachineConfigPoo } -func checkMisconfiguredMOSC(oc *exutil.CLI, moscName, poolName, baseImagePullSecret, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile, +func checkMisconfiguredMOSC(oc *exutil.CLI, moscAndMcpName, baseImagePullSecret, renderedImagePushSecret, pushSpec string, containerFile []ContainerFile, expectedMsg, stepMgs string) { var ( machineConfigCO = NewResource(oc.AsAdmin(), "co", "machine-config") @@ -473,7 +468,7 @@ func checkMisconfiguredMOSC(oc *exutil.CLI, moscName, poolName, baseImagePullSec defer logger.Infof("OK!\n") logger.Infof("Create a misconfiugred MOSC") - mosc, err := CreateMachineOSConfig(oc, moscName, poolName, baseImagePullSecret, renderedImagePushSecret, pushSpec, containerFile) + mosc, err := CreateMachineOSConfig(oc, moscAndMcpName, baseImagePullSecret, renderedImagePushSecret, pushSpec, containerFile) defer mosc.Delete() o.Expect(err).NotTo(o.HaveOccurred(), "Error creating MOSC with wrong pull secret") logger.Infof("OK!")