Merge pull request #5 from shivramsrivastava/dev

Support for GT an LT operators for node affinity.
huawei-cloudnative · Jun 15, 2018 · f7f252b · f7f252b
2 parents 7c616c5 + c45c413
commit f7f252b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/base/label_selector.proto b/src/base/label_selector.proto
@@ -12,9 +12,11 @@ message LabelSelector {
     NOT_IN_SET = 1;
     EXISTS_KEY = 2;
     NOT_EXISTS_KEY = 3;
+    GREATER_THAN = 4;
+    LESSER_THAN = 5;
   }
 
   SelectorType type = 1;
   string key = 2;
   repeated string values = 3;
-}
+}
diff --git a/src/scheduling/label_utils.cc b/src/scheduling/label_utils.cc
@@ -42,6 +42,10 @@ RepeatedPtrField<LabelSelector> NodeSelectorRequirementsAsLabelSelectors(
       type = 2;
     else if (operator_type == "DoesNotExist")
       type = 3;
+    else if (operator_type == "Gt")
+      type = 4;
+    else if (operator_type == "Lt")
+      type = 5;
     selector.set_type(static_cast<LabelSelector_SelectorType>(type));
     for (auto& value : nsm.values()) {
       selector.add_values(value);
@@ -177,6 +181,20 @@ bool SatisfiesLabelSelector(const unordered_map<string, string>& rd_labels,
     case LabelSelector::NOT_EXISTS_KEY: {
       return !ContainsKey(rd_labels, selector.key());
     }
+    case LabelSelector::GREATER_THAN: {
+      const string* value = FindOrNull(rd_labels, selector.key());
+      if (value != NULL) {
+        return (stoi(*value) > stoi(*selector_values.begin()));
+      }
+      return false;
+    }
+    case LabelSelector::LESSER_THAN: {
+      const string* value = FindOrNull(rd_labels, selector.key());
+      if (value != NULL) {
+        return (stoi(*value) < stoi(*selector_values.begin()));
+      }
+      return false;
+    }
     default:
       LOG(FATAL) << "Unsupported selector type: " << selector.type();
   }