Merge pull request zendesk#2927 from zendesk/grosser/valid

PAAS-2064 allow opting out of label validation for services that match multiple deployments
pingfr · Sep 10, 2018 · d028b73 · d028b73
2 parents a91fbed + f697760
commit d028b73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/plugins/kubernetes/app/models/kubernetes/role_validator.rb b/plugins/kubernetes/app/models/kubernetes/role_validator.rb
@@ -98,12 +98,12 @@ def validate_numeric_limits
     def validate_project_and_role_consistent
       labels = @elements.flat_map do |resource|
         kind = resource[:kind]
+        allow_cross_match = resource.dig(:metadata, :annotations, :"samson/service_selector_across_roles") == "true"
+
         label_paths = metadata_paths(resource).map { |p| p + [:labels] } +
           case kind
           when 'Service'
-            [
-              [:spec, :selector]
-            ]
+            allow_cross_match ? [] : [[:spec, :selector]]
           when 'PodDisruptionBudget'
             [
               [:spec, :selector, :matchLabels]

diff --git a/plugins/kubernetes/test/models/kubernetes/role_validator_test.rb b/plugins/kubernetes/test/models/kubernetes/role_validator_test.rb
@@ -353,6 +353,12 @@
         ]
       end
 
+      it "allows cross-matching services when opted in" do
+        role[1][:spec][:selector].delete(:role)
+        role[1][:metadata][:annotations] = {"samson/service_selector_across_roles": "true"}
+        errors.must_be_nil
+      end
+
       it "reports missing label section" do
         role.first[:spec][:template][:metadata].delete(:labels)
         errors.must_equal [