Skip to content

pkg/controller: fix container runtime registries generation #489

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

Merged
openshift-merge-robot merged 1 commit into from
Feb 24, 2019
Merged

pkg/controller: fix container runtime registries generation #489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions pkg/controller/container-runtime-config/container_runtime_config_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,13 @@ func (ctrl *Controller) syncImageConfig(key string) error {
isNotFound := errors.IsNotFound(err)
rci := createNewRegistriesConfigIgnition(registriesTOML)
if !isNotFound && equality.Semantic.DeepEqual(rci, mc.Spec.Config) {
applied = false
return nil
// if the configuration for the registries is equal, we still need to compare
// the generated controller version because during an upgrade we need a new one
mcCtrlVersion := mc.Annotations[ctrlcommon.GeneratedByControllerVersionAnnotationKey]
if mcCtrlVersion == version.Version.String() {
applied = false
return nil
}
Copy link
Member Author

@runcom runcom Feb 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I guess we can also just update that annotation to the new version and avoid a whole new generation with same content, but let's keep it this way for now

}
if isNotFound {
mc = mtmpl.MachineConfigFromIgnConfig(role, managedKey, &ignv2_2types.Config{})
Expand Down