Merge pull request #32 from 2gis/I-21

I-21 check replicas greater or equal
2gis · Sep 26, 2018 · cb5b923 · cb5b923
2 parents 75af6c3 + ccb4621
commit cb5b923
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/k8s/resource.py b/k8s/resource.py
@@ -34,9 +34,9 @@ def __init__(self, command, sync_mode, show_logs):
         self.show_logs = show_logs
 
     @staticmethod
-    def _replicas_are_equal(replicas):
+    def _replicas_count_are_greater_or_equal(replicas):
         replicas = [0 if r is None else r for r in replicas]  # replace all None to 0
-        return all(r == replicas[0] for r in replicas)
+        return all(r >= replicas[0] for r in replicas)
 
     @staticmethod
     def _ports_are_equal(old_port, new_port):
@@ -317,7 +317,7 @@ def _wait_deployment_complete(self, kube_client, tries, timeout):
 
             log.info('desiredReplicas = {}, updatedReplicas = {}, availableReplicas = {}'.
                      format(replicas[0], replicas[4], replicas[2]))
-            if self._replicas_are_equal(replicas) and status.unavailable_replicas is None:
+            if self._replicas_count_are_greater_or_equal(replicas) and status.unavailable_replicas is None:
                 log.info('Deployment completed on {} attempt'.format(i + 1))
                 return
             else:
@@ -338,7 +338,7 @@ def _wait_statefulset_complete(self, kube_client, tries, timeout):
             if current_revision == update_revision:
                 log.info('desiredReplicas = {}, updatedReplicas = {}, availableReplicas = {}'.
                          format(replicas[0], replicas[1], replicas[2]))
-                if self._replicas_are_equal(replicas):
+                if self._replicas_count_are_greater_or_equal(replicas):
                     log.info('StatefulSet completed on {} attempt'.format(i))
                     return
             else:
@@ -355,7 +355,7 @@ def _wait_daemonset_complete(self, kube_client, tries, timeout):
                         status.number_ready, status.updated_number_scheduled]
             log.info('desiredNodes = {}, availableNodes = {}, readyNodes = {}, updatedNodes = {}'.
                      format(replicas[0], replicas[1], replicas[2], replicas[3]))
-            if self._replicas_are_equal(replicas) and status.number_unavailable is None:
+            if self._replicas_count_are_greater_or_equal(replicas) and status.number_unavailable is None:
                 log.info('DaemonSet completed on {} attempt'.format(i))
                 return
             else:

diff --git a/k8s/test_provisioner.py b/k8s/test_provisioner.py
@@ -375,8 +375,16 @@ def test_get_template_context(self):
 class TestKubeObject(unittest.TestCase):
     def test_replicas_equal(self):
         replicas = (1, 1, 1)
-        self.assertTrue(Provisioner._replicas_are_equal(replicas))
+        self.assertTrue(Provisioner._replicas_count_are_greater_or_equal(replicas))
+
+    def test_replicas_greater(self):
+        replicas = (2, 3, 3)
+        self.assertTrue(Provisioner._replicas_count_are_greater_or_equal(replicas))
 
     def test_replicas_not_equal(self):
-        replicas = (0, 1, 1)
-        self.assertFalse(Provisioner._replicas_are_equal(replicas))
+        replicas = (1, 1, 0)
+        self.assertFalse(Provisioner._replicas_count_are_greater_or_equal(replicas))
+
+    def test_replicas_with_hpa_not_equal(self):
+        replicas = (6, 7, 5)
+        self.assertFalse(Provisioner._replicas_count_are_greater_or_equal(replicas))