Skip to content
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

Jump to bottom

ACM-14502: Allow updates to InfraEnv version #6808

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+164 −40
Open

ACM-14502: Allow updates to InfraEnv version #6808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
70510ed
Add version to infraenv update params
carbonin Sep 25, 2024
1e39123
Update infraenv OpenshiftVersion when provided in REST API
carbonin Sep 25, 2024
849ccce
Update infraenv OpenshiftVersion when kube OSImageVersion is changed
carbonin Sep 25, 2024
cc8f9fe
Extract complex updates to reduce cyclomatic complexity of updateInfr…
carbonin Sep 26, 2024
873b187
Rename function and use update params
carbonin Sep 27, 2024
15d4ac1
Add validation for the new infraenv version earlier
carbonin Sep 27, 2024
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
3 changes: 3 additions & 0 deletions api/vendor/github.com/openshift/assisted-service/models/infra_env_update_params.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions client/vendor/github.com/openshift/assisted-service/models/infra_env_update_params.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

97 changes: 67 additions & 30 deletions internal/bminventory/inventory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4309,12 +4309,12 @@ func validateProxySettings(httpProxy, httpsProxy, noProxy, ocpVersion *string) e
return nil
}

// validateArchitectureAndVersion validates if architecture specified inside Infraenv matches one
// validateClusterArchitectureAndVersion validates if architecture specified inside Infraenv matches one
// specified for the cluster. For single-arch clusters the validation needs to only compare values
// of the params. For multiarch cluster we want to see if the multiarch release image contains the
// the architecture specifically requested by the InfraEnv. We don't need to explicitly validate if
// the OS image exists because if not, this will be detected by the function generating the ISO.
func validateArchitectureAndVersion(v versions.Handler, c *common.Cluster, cpuArch, ocpVersion string) error {
func validateClusterArchitectureAndVersion(v versions.Handler, c *common.Cluster, cpuArch, ocpVersion string) error {
// For late-binding we don't know the cluster yet
if c == nil {
return nil
Expand Down Expand Up @@ -4752,7 +4752,7 @@ func (b *bareMetalInventory) RegisterInfraEnvInternal(
func (b *bareMetalInventory) validateInfraEnvCreateParams(ctx context.Context, params installer.RegisterInfraEnvParams, cluster *common.Cluster) error {
var err error

if err = validateArchitectureAndVersion(b.versionsHandler, cluster, params.InfraenvCreateParams.CPUArchitecture, params.InfraenvCreateParams.OpenshiftVersion); err != nil {
if err = validateClusterArchitectureAndVersion(b.versionsHandler, cluster, params.InfraenvCreateParams.CPUArchitecture, params.InfraenvCreateParams.OpenshiftVersion); err != nil {
return err
}

Expand Down Expand Up @@ -4977,6 +4977,16 @@ func (b *bareMetalInventory) UpdateInfraEnvInternal(ctx context.Context, params
return common.NewApiError(http.StatusBadRequest, err)
}

openshiftVersion := infraEnv.OpenshiftVersion
if params.InfraEnvUpdateParams.OpenshiftVersion != nil {
openshiftVersion = *params.InfraEnvUpdateParams.OpenshiftVersion
}

_, err = b.osImages.GetOsImageOrLatest(openshiftVersion, infraEnv.CPUArchitecture)
if err != nil {
return common.NewApiError(http.StatusBadRequest, err)
}

var cluster *common.Cluster
clusterId := infraEnv.ClusterID
if clusterId != "" {
Expand All @@ -4988,7 +4998,7 @@ func (b *bareMetalInventory) UpdateInfraEnvInternal(ctx context.Context, params
cluster = nil
}
}
if err = validateArchitectureAndVersion(b.versionsHandler, cluster, infraEnv.CPUArchitecture, infraEnv.OpenshiftVersion); err != nil {
if err = validateClusterArchitectureAndVersion(b.versionsHandler, cluster, infraEnv.CPUArchitecture, openshiftVersion); err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

What if it's a late-binding infraEnv? Would we still want to validate the version with this function or does it not matter if the infraEnv isn't bound to a cluster?

Copy link
Member Author

@carbonin carbonin Sep 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think so. IIRC we don't actually require someone to have defined cluster image sets (for the kubeapi case) before defining the infraenv. I'd rather leave that validation to the cluster API rather than tie infraenv and cluster concerns more tightly together.

Copy link
Contributor

Choose a reason for hiding this comment

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

Right, we don't require a cluster image set for InfraEnv creation. That makes sense. Thanks!

return err
}
if err = featuresupport.ValidateIncompatibleFeatures(log, infraEnv.CPUArchitecture, cluster, &infraEnv.InfraEnv, params.InfraEnvUpdateParams); err != nil {
Expand Down Expand Up @@ -5054,40 +5064,24 @@ func (b *bareMetalInventory) validateDiscoveryIgnitionImageSize(ctx context.Cont

func (b *bareMetalInventory) updateInfraEnvData(infraEnv *common.InfraEnv, params installer.UpdateInfraEnvParams, internalIgnitionConfig *string, db *gorm.DB, log logrus.FieldLogger) error {
updates := map[string]interface{}{}
if params.InfraEnvUpdateParams.Proxy != nil {
proxyHash, err := computeProxyHash(params.InfraEnvUpdateParams.Proxy)
if err != nil {
return err
}
if proxyHash != infraEnv.ProxyHash {
optionalParam(params.InfraEnvUpdateParams.Proxy.HTTPProxy, "proxy_http_proxy", updates)
optionalParam(params.InfraEnvUpdateParams.Proxy.HTTPSProxy, "proxy_https_proxy", updates)
optionalParam(params.InfraEnvUpdateParams.Proxy.NoProxy, "proxy_no_proxy", updates)
updates["proxy_hash"] = proxyHash
}
if err := b.updateInfraEnvProxy(params, infraEnv, updates); err != nil {
return err
}
if params.InfraEnvUpdateParams.KernelArguments != nil {
if len(params.InfraEnvUpdateParams.KernelArguments) > 0 {
b, err := json.Marshal(&params.InfraEnvUpdateParams.KernelArguments)
if err != nil {
return common.NewApiError(http.StatusBadRequest, errors.Wrap(err, "failed to format kernel arguments as json"))
}
updates["kernel_arguments"] = string(b)
} else {
updates["kernel_arguments"] = gorm.Expr("NULL")
}
if infraEnv.ClusterID != "" {
if err := b.setDiscoveryKernelArgumentsUsage(db, infraEnv.ClusterID, params.InfraEnvUpdateParams.KernelArguments); err != nil {
log.WithError(err).Warnf("failed to set discovery kernel arguments usage for cluster %s", infraEnv.ClusterID)
}
}

if err := b.updateInfraEnvKernelArguments(params, infraEnv, updates, log, db); err != nil {
return err
}

inputSSHKey := swag.StringValue(params.InfraEnvUpdateParams.SSHAuthorizedKey)
if inputSSHKey != "" && inputSSHKey != infraEnv.SSHAuthorizedKey {
updates["ssh_authorized_key"] = inputSSHKey
}

inputVersion := swag.StringValue(params.InfraEnvUpdateParams.OpenshiftVersion)
if inputVersion != "" && inputVersion != infraEnv.OpenshiftVersion {
updates["openshift_version"] = inputVersion
}

if err := b.updateInfraEnvNtpSources(params, infraEnv, updates, log); err != nil {
return err
}
Expand Down Expand Up @@ -5225,6 +5219,49 @@ func (b *bareMetalInventory) updateInfraEnvNtpSources(params installer.UpdateInf
return nil
}

func (b *bareMetalInventory) updateInfraEnvProxy(params installer.UpdateInfraEnvParams, infraEnv *common.InfraEnv, updates map[string]interface{}) error {
if params.InfraEnvUpdateParams.Proxy == nil {
return nil
}

proxyHash, err := computeProxyHash(params.InfraEnvUpdateParams.Proxy)
if err != nil {
return err
}

if proxyHash != infraEnv.ProxyHash {
optionalParam(params.InfraEnvUpdateParams.Proxy.HTTPProxy, "proxy_http_proxy", updates)
optionalParam(params.InfraEnvUpdateParams.Proxy.HTTPSProxy, "proxy_https_proxy", updates)
optionalParam(params.InfraEnvUpdateParams.Proxy.NoProxy, "proxy_no_proxy", updates)
updates["proxy_hash"] = proxyHash
}

return nil
}

func (b *bareMetalInventory) updateInfraEnvKernelArguments(params installer.UpdateInfraEnvParams, infraEnv *common.InfraEnv, updates map[string]interface{}, log logrus.FieldLogger, db *gorm.DB) error {
if params.InfraEnvUpdateParams.KernelArguments == nil {
return nil
}

if len(params.InfraEnvUpdateParams.KernelArguments) > 0 {
b, err := json.Marshal(&params.InfraEnvUpdateParams.KernelArguments)
if err != nil {
return common.NewApiError(http.StatusBadRequest, errors.Wrap(err, "failed to format kernel arguments as json"))
}
updates["kernel_arguments"] = string(b)
} else {
updates["kernel_arguments"] = gorm.Expr("NULL")
}
if infraEnv.ClusterID != "" {
if err := b.setDiscoveryKernelArgumentsUsage(db, infraEnv.ClusterID, params.InfraEnvUpdateParams.KernelArguments); err != nil {
log.WithError(err).Warnf("failed to set discovery kernel arguments usage for cluster %s", infraEnv.ClusterID)
}
}

return nil
}

func (b *bareMetalInventory) GetInfraEnvByKubeKey(key types.NamespacedName) (*common.InfraEnv, error) {
infraEnv, err := common.GetInfraEnvFromDBWhere(b.db, "name = ? and kube_key_namespace = ?", key.Name, key.Namespace)
if err != nil {
Expand Down
38 changes: 28 additions & 10 deletions internal/bminventory/inventory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8909,6 +8909,22 @@ var _ = Describe("infraEnvs", func() {
Expect(err).ToNot(HaveOccurred())
Expect(i.IgnitionConfigOverride).To(Equal(override))
})
It("Update OpenshiftVersion", func() {
mockInfraEnvUpdateSuccess()
updateOCPVersion := "4.18"
Expect(i.OpenshiftVersion).ToNot(Equal(updateOCPVersion))
reply := bm.UpdateInfraEnv(ctx, installer.UpdateInfraEnvParams{
InfraEnvID: *i.ID,
InfraEnvUpdateParams: &models.InfraEnvUpdateParams{
OpenshiftVersion: swag.String(updateOCPVersion),
},
})
Expect(reply).To(BeAssignableToTypeOf(installer.NewUpdateInfraEnvCreated()))
var err error
i, err = bm.GetInfraEnvInternal(ctx, installer.GetInfraEnvParams{InfraEnvID: *i.ID})
Expect(err).ToNot(HaveOccurred())
Expect(i.OpenshiftVersion).To(HaveValue(Equal(updateOCPVersion)))
})
It("Update Image type", func() {
var err error
mockInfraEnvUpdateSuccess()
Expand Down Expand Up @@ -9416,7 +9432,7 @@ var _ = Describe("infraEnvs", func() {
i, err := bm.GetInfraEnvInternal(ctx, installer.GetInfraEnvParams{InfraEnvID: infraEnvID})
Expect(err).ToNot(HaveOccurred())

mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil)
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), bm.IgnitionConfig, true, bm.authHandler.AuthType(), gomock.Any()).Return("ignitionconfigforlogging", nil).Times(1)
mockEvents.EXPECT().SendInfraEnvEvent(ctx, eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand Down Expand Up @@ -9461,7 +9477,7 @@ var _ = Describe("infraEnvs", func() {
err := db.Create(boundedInfraEnv).Error
Expect(err).ToNot(HaveOccurred())

mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil)
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), bm.IgnitionConfig, true, bm.authHandler.AuthType(), gomock.Any()).Return("ignitionconfigforlogging", nil).Times(1)
mockEvents.EXPECT().SendInfraEnvEvent(ctx, eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand Down Expand Up @@ -9501,7 +9517,7 @@ var _ = Describe("infraEnvs", func() {
It("sets a valid image_token", func() {
i, err := bm.GetInfraEnvInternal(ctx, installer.GetInfraEnvParams{InfraEnvID: infraEnvID})
Expect(err).ToNot(HaveOccurred())
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil)
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), bm.IgnitionConfig, true, bm.authHandler.AuthType(), gomock.Any()).Return("ignitionconfigforlogging", nil)
mockEvents.EXPECT().SendInfraEnvEvent(ctx, eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand Down Expand Up @@ -9529,7 +9545,7 @@ var _ = Describe("infraEnvs", func() {
It("updates the infra-env expires_at time", func() {
i, err := bm.GetInfraEnvInternal(ctx, installer.GetInfraEnvParams{InfraEnvID: infraEnvID})
Expect(err).ToNot(HaveOccurred())
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil)
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), bm.IgnitionConfig, true, bm.authHandler.AuthType(), gomock.Any()).Return("ignitionconfigforlogging", nil)
mockEvents.EXPECT().SendInfraEnvEvent(ctx, eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand Down Expand Up @@ -9582,7 +9598,7 @@ var _ = Describe("infraEnvs", func() {
It("does not update the image service url if nothing changed", func() {
i, err := bm.GetInfraEnvInternal(ctx, installer.GetInfraEnvParams{InfraEnvID: infraEnvID})
Expect(err).ToNot(HaveOccurred())
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).Times(2)
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), bm.IgnitionConfig, true, bm.authHandler.AuthType(), gomock.Any()).Return("ignitionconfigforlogging", nil).Times(1)
mockEvents.EXPECT().SendInfraEnvEvent(ctx, eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand All @@ -9598,7 +9614,7 @@ var _ = Describe("infraEnvs", func() {
It("updates the image service url when things change", func() {
i, err := bm.GetInfraEnvInternal(ctx, installer.GetInfraEnvParams{InfraEnvID: infraEnvID})
Expect(err).ToNot(HaveOccurred())
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).Times(7)
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, "").Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), bm.IgnitionConfig, true, bm.authHandler.AuthType(), gomock.Any()).Return("ignitionconfigforlogging", nil).Times(7)
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), bm.IgnitionConfig, false, bm.authHandler.AuthType(), gomock.Any()).Return(discovery_ignition_3_1, nil).AnyTimes()
mockEvents.EXPECT().SendInfraEnvEvent(ctx, eventstest.NewEventMatcher(
Expand Down Expand Up @@ -9733,6 +9749,7 @@ var _ = Describe("infraEnvs", func() {

It("Invalid NTP source", func() {
ntpSource := "inject'"
mockOSImages.EXPECT().GetOsImageOrLatest(gomock.Any(), gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
reply := bm.UpdateInfraEnv(ctx, installer.UpdateInfraEnvParams{
InfraEnvID: infraEnvID,
InfraEnvUpdateParams: &models.InfraEnvUpdateParams{
Expand Down Expand Up @@ -11910,7 +11927,7 @@ var _ = Describe("V2DownloadInfraEnvFiles", func() {
"p3=\"this is an argument\"",
}
initialKernelArguments := `random.trust_cpu=on rd.luks.options=discard ignition.firstboot ignition.platform.id=metal console=tty1 console=ttyS1,115200n8 coreos.inst.persistent-kargs="console=tty1 console=ttyS1,115200n8"`
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).Times(3)
mockOSImages.EXPECT().GetOsImageOrLatest(common.TestDefaultConfig.OpenShiftVersion, gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
content := getResponseData("ipxe-script", false, nil, "")
lines := strings.Split(string(content), "\n")

Expand Down Expand Up @@ -12224,7 +12241,7 @@ var _ = Describe("UpdateInfraEnv - Ignition", func() {
InfraEnvUpdateParams: &models.InfraEnvUpdateParams{IgnitionConfigOverride: override},
}
mockUsageReports()
mockOSImages.EXPECT().GetOsImageOrLatest("", gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).Times(1)
mockOSImages.EXPECT().GetOsImageOrLatest("", gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(discovery_ignition_3_1, nil).AnyTimes()
mockEvents.EXPECT().SendInfraEnvEvent(gomock.Any(), eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand Down Expand Up @@ -12298,7 +12315,7 @@ var _ = Describe("UpdateInfraEnv - Ignition", func() {
InfraEnvID: *infraEnv.ID,
InfraEnvUpdateParams: &models.InfraEnvUpdateParams{IgnitionConfigOverride: override},
}
mockOSImages.EXPECT().GetOsImageOrLatest("", gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).Times(1)
mockOSImages.EXPECT().GetOsImageOrLatest("", gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(discovery_ignition_3_1, nil).AnyTimes()
mockEvents.EXPECT().SendInfraEnvEvent(gomock.Any(), eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand Down Expand Up @@ -12331,7 +12348,7 @@ var _ = Describe("UpdateInfraEnv - Ignition", func() {
InfraEnvID: *infraEnv.ID,
InfraEnvUpdateParams: &models.InfraEnvUpdateParams{IgnitionConfigOverride: override},
}
mockOSImages.EXPECT().GetOsImageOrLatest("", gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).Times(1)
mockOSImages.EXPECT().GetOsImageOrLatest("", gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(discovery_ignition_3_1, nil).Times(1)
mockEvents.EXPECT().SendInfraEnvEvent(gomock.Any(), eventstest.NewEventMatcher(
eventstest.WithNameMatcher(eventgen.ImageInfoUpdatedEventName),
Expand All @@ -12352,6 +12369,7 @@ var _ = Describe("UpdateInfraEnv - Ignition", func() {
largeDiscoveryIgnition := fmt.Sprintf(`{"ignition": {"version": "3.1.0"}, "storage": {"files": [{"path": "/tmp/example", "contents": {"source": "data:text/plain;base64,%s"}}]}}`, content)
override := `{"ignition": {"version": "3.1.0"}, "storage": {"files": [{"path": "/tmp/example", "contents": {"source": "data:text/plain;base64,aGVscGltdHJhcHBlZGluYXN3YWdnZXJzcGVj"}}]}}`

mockOSImages.EXPECT().GetOsImageOrLatest("", gomock.Any()).Return(common.TestDefaultConfig.OsImage, nil).AnyTimes()
mockIgnitionBuilder.EXPECT().FormatDiscoveryIgnitionFile(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(largeDiscoveryIgnition, nil).AnyTimes()
mockUsage.EXPECT().Add(gomock.Any(), usage.IgnitionConfigOverrideUsage, gomock.Any()).Times(1)
mockUsage.EXPECT().Save(gomock.Any(), gomock.Any(), gomock.Any()).Times(1)
Expand Down
3 changes: 3 additions & 0 deletions internal/controller/controllers/infraenv_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ func (r *InfraEnvReconciler) updateInfraEnv(ctx context.Context, log logrus.Fiel
if strings.TrimSpace(infraEnv.Spec.AdditionalTrustBundle) != internalInfraEnv.AdditionalTrustBundle {
updateParams.InfraEnvUpdateParams.AdditionalTrustBundle = &infraEnv.Spec.AdditionalTrustBundle
}
if infraEnv.Spec.OSImageVersion != "" && infraEnv.Spec.OSImageVersion != internalInfraEnv.OpenshiftVersion {
updateParams.InfraEnvUpdateParams.OpenshiftVersion = &infraEnv.Spec.OSImageVersion
}

pullSecretKey := getPullSecretKey(infraEnv.Namespace, infraEnv.Spec.PullSecretRef)
pullSecret, err := r.PullSecretHandler.GetValidPullSecret(ctx, pullSecretKey)
Expand Down
3 changes: 3 additions & 0 deletions models/infra_env_update_params.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions restapi/embedded_spec.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading