Merge pull request #98 from shivramsrivastava/affinity_enhancement

Node Affinity and Node Anti-Affinity enhancement related changes.
kubernetes-retired · May 25, 2018 · 096d0af · 096d0af
2 parents 8c106d0 + 29b2fa4
commit 096d0af
Show file tree

Hide file tree

Showing 41 changed files with 2,740 additions and 281 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/firmament/BUILD b/pkg/firmament/BUILD
@@ -3,13 +3,17 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
+        "affinity.pb.go",
         "coco_interference_scores.pb.go",
         "firmament_client.go",
         "firmament_scheduler.pb.go",
         "firmament_scheduler_mock.go",
         "job_desc.pb.go",
         "label.pb.go",
         "label_selector.pb.go",
+        "node_affinity.pb.go",
+        "pod_affinity.pb.go",
+        "pod_anti_affinity.pb.go",
         "reference_desc.pb.go",
         "resource_desc.pb.go",
         "resource_stats.pb.go",

diff --git a/pkg/firmament/affinity.pb.go b/pkg/firmament/affinity.pb.go
diff --git a/pkg/firmament/affinity.proto b/pkg/firmament/affinity.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package firmament;
+
+import "node_affinity.proto";
+import "pod_affinity.proto";
+import "pod_anti_affinity.proto";
+
+message Affinity {
+
+    NodeAffinity node_affinity = 1;
+
+    PodAffinity pod_affinity = 2;
+
+    PodAntiAffinity pod_anti_affinity = 3;
+}
+
+
diff --git a/pkg/firmament/coco_interference_scores.pb.go b/pkg/firmament/coco_interference_scores.pb.go