Skip to content

Add extra filter for checking if registries have changed #461

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 20, 2019
Merged

Add extra filter for checking if registries have changed #461

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
24 changes: 17 additions & 7 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 @@ -10,6 +10,7 @@ import (
"github.com/golang/glog"
"github.com/vincent-petithory/dataurl"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -536,15 +537,12 @@ func (ctrl *Controller) syncImageConfig(key string) error {
return err
}
for _, pool := range mcpPools {
// To keep track of whether we "actually" got an updated image config
applied := true
role := pool.Name
// Get MachineConfig
managedKey := getManagedKeyReg(pool, imgcfg)
if err := retry.RetryOnConflict(updateBackoff, func() error {
mc, err := ctrl.client.Machineconfiguration().MachineConfigs().Get(managedKey, metav1.GetOptions{})
if err != nil && !errors.IsNotFound(err) {
return fmt.Errorf("could not find MachineConfig: %v", err)
}
isNotFound := errors.IsNotFound(err)
// Generate the original registries config
_, _, originalRegistriesIgn, err := ctrl.generateOriginalContainerRuntimeConfigs(role)
if err != nil {
Expand All @@ -559,9 +557,19 @@ func (ctrl *Controller) syncImageConfig(key string) error {
}
registriesTOML, err = updateRegistriesConfig(dataURL.Data, imgcfg.Spec)
if err != nil {
return fmt.Errorf("could not update container runtime config with new changes: %v", err)
return fmt.Errorf("could not update registries config with new changes: %v", err)
}
}
mc, err := ctrl.client.Machineconfiguration().MachineConfigs().Get(managedKey, metav1.GetOptions{})
if err != nil && !errors.IsNotFound(err) {
return fmt.Errorf("could not find MachineConfig: %v", err)
}
isNotFound := errors.IsNotFound(err)
rci := createNewRegistriesConfigIgnition(registriesTOML)
if !isNotFound && equality.Semantic.DeepEqual(rci, mc.Spec.Config) {
applied = false
return nil
}
if isNotFound {
mc = mtmpl.MachineConfigFromIgnConfig(role, managedKey, &ignv2_2types.Config{})
}
Expand All @@ -588,7 +596,9 @@ func (ctrl *Controller) syncImageConfig(key string) error {
}); err != nil {
return fmt.Errorf("could not Create/Update MachineConfig: %v", err)
}
glog.Infof("Applied ImageConfig cluster on MachineConfigPool %v", pool.Name)
if applied {
glog.Infof("Applied ImageConfig cluster on MachineConfigPool %v", pool.Name)
}
}

return nil
Expand Down