diff --git a/CHANGES/1067.removal b/CHANGES/1067.removal new file mode 100644 index 000000000..d3d6843f8 --- /dev/null +++ b/CHANGES/1067.removal @@ -0,0 +1,2 @@ +Removed the validation for version mismatch between pulp-minimal and pulp-web images +when the number of replicas for pulp-web is set to 0. diff --git a/controllers/repo_manager/precheck.go b/controllers/repo_manager/precheck.go index e22fa0b5a..fbd6de87a 100644 --- a/controllers/repo_manager/precheck.go +++ b/controllers/repo_manager/precheck.go @@ -119,7 +119,7 @@ func initializeStatusCondition(ctx context.Context, r *RepoManagerReconciler, pu // checkImageVersion verifies if pulp-webcheckImageVersion image version matches pulp-minimal func checkImageVersion(r *RepoManagerReconciler, pulp *repomanagerpulpprojectorgv1beta2.Pulp) *ctrl.Result { - if r.needsPulpWeb(pulp) && pulp.Spec.ImageVersion != pulp.Spec.ImageWebVersion { + if r.needsPulpWeb(pulp) && pulp.Spec.ImageVersion != pulp.Spec.ImageWebVersion && pulp.Spec.Web.Replicas > 0 { if pulp.Spec.InhibitVersionConstraint { controllers.CustomZapLogger().Warn("image_version should be equal to image_web_version! Using different versions is not recommended and can make the application unreachable") } else { diff --git a/main.go b/main.go index d6f889290..e1b2475bd 100644 --- a/main.go +++ b/main.go @@ -177,7 +177,7 @@ func main() { os.Exit(1) } - setupLog.Info("pulp-operator version: 1.0.4-beta.5") + setupLog.Info("pulp-operator version: 1.0.5-beta.5") setupLog.Info("starting manager") if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil { setupLog.Error(err, "problem running manager")