bypass template upserts on registry only change; ignore unskips on registry change

Author: gabemontero

pkg/stub/config.go

@@ -67,12 +67,15 @@ func (h *Handler) SpecValidation(cfg *v1.Config) error {
 // second boolean: does the config change require a samples upsert; for example, simply adding
 // to a skip list does not require a samples upsert
 // third boolean: even if an upsert is not needed, update the config instance to clear out image import errors
+// fourth boolean: if the registry changed, that means a) we have to update all imagestreams regardless of skip lists;
+// and b) we don't have to update the templates if that is the only change
 // first map: imagestreams that were unskipped (imagestream updates can be expensive, so an optimization)
 // second map: templates that were unskipped
-func (h *Handler) VariableConfigChanged(cfg *v1.Config) (bool, bool, bool, map[string]bool, map[string]bool) {
+func (h *Handler) VariableConfigChanged(cfg *v1.Config) (bool, bool, bool, bool, map[string]bool, map[string]bool) {
 	configChangeAtAll := false
 	configChangeRequireUpsert := false
 	clearImageImportErrors := false
+	registryChange := false
 
 	logrus.Debugf("the before skipped templates %#v", cfg.Status.SkippedTemplates)
 	logrus.Debugf("the after skipped templates %#v and associated map %#v", cfg.Spec.SkippedTemplates, h.skippedTemplates)
@@ -101,12 +104,6 @@ func (h *Handler) VariableConfigChanged(cfg *v1.Config) (bool, bool, bool, map[s
 		logrus.Printf("SkippedTemplates changed from %#v to %#v", cfg.Status.SkippedTemplates, cfg.Spec.SkippedTemplates)
 	}
 
-	if cfg.Spec.SamplesRegistry != cfg.Status.SamplesRegistry {
-		logrus.Printf("SamplesRegistry changed from %s to %s", cfg.Status.SamplesRegistry, cfg.Spec.SamplesRegistry)
-		configChangeAtAll = true
-		configChangeRequireUpsert = true
-	}
-
 	streamChange := false
 	// capture additions/subtractions from skipped list in general change boolean
 	if len(cfg.Spec.SkippedImagestreams) != len(cfg.Status.SkippedImagestreams) {
@@ -147,7 +144,16 @@ func (h *Handler) VariableConfigChanged(cfg *v1.Config) (bool, bool, bool, map[s
 		}
 	}
 
-	return configChangeAtAll, configChangeRequireUpsert, clearImageImportErrors, unskippedStreams, unskippedTemplates
+	if cfg.Spec.SamplesRegistry != cfg.Status.SamplesRegistry {
+		logrus.Printf("SamplesRegistry changed from %s to %s", cfg.Status.SamplesRegistry, cfg.Spec.SamplesRegistry)
+		configChangeAtAll = true
+		configChangeRequireUpsert = true
+		// skip/unskip imagestream does not matter, reset that list
+		registryChange = true
+		unskippedStreams = map[string]bool{}
+	}
+
+	return configChangeAtAll, configChangeRequireUpsert, clearImageImportErrors, registryChange, unskippedStreams, unskippedTemplates
 }
 
 func (h *Handler) buildSkipFilters(opcfg *v1.Config) {

pkg/stub/handler.go

@@ -537,10 +537,11 @@ func (h *Handler) Handle(event v1.Event) error {
 		configChanged := false
 		configChangeRequiresUpsert := false
 		configChangeRequiresImportErrorUpdate := false
+		registryChanged := false
 		unskippedStreams := map[string]bool{}
 		unskippedTemplates := map[string]bool{}
 		if cfg.Spec.ManagementState == cfg.Status.ManagementState {
-			configChanged, configChangeRequiresUpsert, configChangeRequiresImportErrorUpdate, unskippedStreams, unskippedTemplates = h.VariableConfigChanged(cfg)
+			configChanged, configChangeRequiresUpsert, configChangeRequiresImportErrorUpdate, registryChanged, unskippedStreams, unskippedTemplates = h.VariableConfigChanged(cfg)
 			logrus.Debugf("config changed %v upsert needed %v import error upd needed %v exists/true %v progressing/false %v op version %s status version %s",
 				configChanged,
 				configChangeRequiresUpsert,
@@ -561,7 +562,7 @@ func (h *Handler) Handle(event v1.Event) error {
 				// and see if any samples were deleted while samples operator was down
 				h.buildFileMaps(cfg, false)
 				// passing in false means if the samples is present, we leave it alone
-				return h.createSamples(cfg, false, unskippedStreams, unskippedTemplates)
+				return h.createSamples(cfg, false, registryChanged, unskippedStreams, unskippedTemplates)
 			}
 			// if config changed requiring an upsert, but a prior config action is still in progress,
 			// reset in progress to false and return; the next event should drive the actual
@@ -670,7 +671,7 @@ func (h *Handler) Handle(event v1.Event) error {
 				return err
 			}
 
-			err = h.createSamples(cfg, true, unskippedStreams, unskippedTemplates)
+			err = h.createSamples(cfg, true, registryChanged, unskippedStreams, unskippedTemplates)
 			if err != nil {
 				h.processError(cfg, v1.ImageChangesInProgress, corev1.ConditionUnknown, err, "error creating samples: %v")
 				logrus.Printf("CRDUPDATE setting in progress to unknown")
@@ -787,7 +788,7 @@ func (h *Handler) setSampleManagedLabelToFalse(kind, name string) error {
 	return nil
 }
 
-func (h *Handler) createSamples(cfg *v1.Config, updateIfPresent bool, unskippedStreams, unskippedTemplates map[string]bool) error {
+func (h *Handler) createSamples(cfg *v1.Config, updateIfPresent, registryChanged bool, unskippedStreams, unskippedTemplates map[string]bool) error {
 	// first, got through the list and prime our upsert cache
 	// prior to any actual upserts
 	imagestreams := []*imagev1.ImageStream{}
@@ -835,6 +836,13 @@ func (h *Handler) createSamples(cfg *v1.Config, updateIfPresent bool, unskippedS
 			return err
 		}
 	}
+
+	// if after initial startup, and not migration, the only cfg change was changing the registry, since that does not impact
+	// the templates, we can move on
+	if len(unskippedTemplates) == 0 && registryChanged && cfg.ConditionTrue(v1.SamplesExist) && cfg.ConditionFalse(v1.MigrationInProgress) {
+		return nil
+	}
+
 	for _, fileName := range h.templateFile {
 		template, err := h.Filetemplategetter.Get(fileName)
 		if err != nil {