Merge pull request #243 from web-seven/bugfix/237-post-policy

fixed registry policy early init

internal/registry/local.go

@@ -119,15 +119,37 @@ func (r *Registry) CreateLocal(ctx context.Context, client *kubernetes.Clientset
 	appsv1.AddToScheme(scheme)
 	ctrlClient, _ := ctrl.New(configClient, ctrl.Options{Scheme: scheme})
 	for _, res := range []ctrl.Object{deploy, svc} {
-		_, err := controllerutil.CreateOrUpdate(ctx, ctrlClient, res, func() error {
-			if res == svc {
+		_, err := controllerutil.CreateOrUpdate(ctx, ctrlClient, res, func() error { return nil })
+		if err != nil {
+			return err
+		}
+	}
+
+	timeout := time.After(30 * time.Second)
+	ticker := time.NewTicker(1 * time.Second)
+	deployIsReady := false
+	for !deployIsReady {
+		select {
+		case <-timeout:
+			return errors.New("local registry to not comes ready")
+		case <-ticker.C:
+			deploy, err = client.AppsV1().
+				Deployments(namespace.Namespace).
+				Get(ctx, deploy.GetName(), v1.GetOptions{})
+			if err != nil {
+				return err
+			}
+			deployIsReady = deploy.Status.ReadyReplicas > 0
+
+			if deployIsReady {
 				logger.Debug("Installing policy controller")
 				err = policy.AddPolicyConroller(ctx, configClient, policy.DefaultPolicyController)
 				if err != nil {
 					logger.Warnln("Policy controller has issues, without it, local registry could not work normally.")
 					return err
 				}
 				logger.Debug("Policy controller installed.")
+
 				logger.Debug("Installing policies")
 				err = policy.AddRegistryPolicy(ctx,
 					configClient,
@@ -142,28 +164,6 @@ func (r *Registry) CreateLocal(ctx context.Context, client *kubernetes.Clientset
 				}
 				logger.Debug("Policies installed.")
 			}
-			return nil
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	timeout := time.After(30 * time.Second)
-	ticker := time.NewTicker(1 * time.Second)
-	deployIsReady := false
-	for !deployIsReady {
-		select {
-		case <-timeout:
-			return errors.New("local registry to not comes ready")
-		case <-ticker.C:
-			deploy, err = client.AppsV1().
-				Deployments(namespace.Namespace).
-				Get(ctx, deploy.GetName(), v1.GetOptions{})
-			if err != nil {
-				return err
-			}
-			deployIsReady = deploy.Status.ReadyReplicas > 0
 		}
 	}