Merge pull request #2981 from zendesk/jylee/deletedefaultclasses

support all kubernetes resources by default
zendesk · Oct 8, 2018 · b216397 · b216397
2 parents cdf5940 + 8ba98a3
commit b216397
Show file tree

Hide file tree

Showing 7 changed files with 250 additions and 288 deletions.
diff --git a/plugins/kubernetes/app/models/kubernetes/resource.rb b/plugins/kubernetes/app/models/kubernetes/resource.rb
@@ -237,12 +237,6 @@ def ignore_404
       end
     end
 
-    class ConfigMap < Base
-    end
-
-    class HorizontalPodAutoscaler < Base
-    end
-
     class Service < Base
       private
 
@@ -429,9 +423,6 @@ def request_delete
       end
     end
 
-    class CronJob < Base
-    end
-
     class Pod < Base
       def deploy
         delete
@@ -448,7 +439,8 @@ def deploy
     end
 
     def self.build(*args)
-      "Kubernetes::Resource::#{args.first.fetch(:kind)}".constantize.new(*args)
+      klass = "Kubernetes::Resource::#{args.first.fetch(:kind)}".safe_constantize || Base
+      klass.new(*args)
     end
   end
 end
diff --git a/plugins/kubernetes/app/models/kubernetes/role_validator.rb b/plugins/kubernetes/app/models/kubernetes/role_validator.rb
@@ -2,16 +2,7 @@
 module Kubernetes
   class RoleValidator
     VALID_LABEL = /\A[a-zA-Z0-9]([-a-zA-Z0-9]*[a-zA-Z0-9])?\z/ # also used in js ... cannot use /i
-    IGNORED = ['ConfigMap', 'HorizontalPodAutoscaler', 'PodDisruptionBudget'].freeze
-    SUPPORTED_KINDS = [
-      ['Deployment'],
-      ['DaemonSet'],
-      ['Deployment', 'Service'],
-      ['Service', 'StatefulSet'],
-      ['Job'],
-      ['CronJob'],
-      ['Pod'],
-    ].freeze
+    ALLOWED_DUPLICATE_KINDS = ['ConfigMap', 'Service'].freeze
 
     def initialize(elements)
       @elements = elements.compact
@@ -22,8 +13,9 @@ def validate
       return ["No content found"] if @elements.blank?
       return ["Only hashes supported"] unless @elements.all? { |e| e.is_a?(Hash) }
       validate_name
+      validate_name_kinds_are_unique
       validate_namespace
-      validate_kinds
+      validate_single_primary_kind
       validate_api_version
       validate_containers
       validate_container_name
@@ -74,16 +66,19 @@ def validate_namespace
       @errors << "Namespaces need to be unique" if map_attributes([:metadata, :namespace]).uniq.size != 1
     end
 
-    def validate_kinds
+    # multiple pods in a single role will make validations misbehave (recommend they all have the same role etc)
+    def validate_single_primary_kind
       kinds = map_attributes([:kind])
-      IGNORED.each { |k| kinds.delete k }
-      uniq_element!(kinds, 'Service') # ignore multiple services
-      kinds.sort_by!(&:to_s)
-
-      return if SUPPORTED_KINDS.include?(kinds)
-      supported = SUPPORTED_KINDS.map { |c| c.join(' + ') }.join(', ')
-      @errors << "Unsupported combination of kinds: #{kinds.join(' + ')}" \
-        ", supported combinations are: #{supported} and #{IGNORED.join(", ")}"
+      return if kinds.count { |k| RoleConfigFile::PRIMARY_KINDS.include?(k) } < 2
+      @errors << "Only use a maximum of 1 primary kind in a role (#{RoleConfigFile::PRIMARY_KINDS.join(", ")})"
+    end
+
+    # template_filler.rb sets name for everything except for ConfigMaps and Service so we need to make sure
+    # users dont use the same kind otherwise they get a duplicate name
+    def validate_name_kinds_are_unique
+      kinds = map_attributes([:kind]) - ALLOWED_DUPLICATE_KINDS
+      return if kinds.uniq.size == kinds.size
+      @errors << "Only use a maximum of 1 of each kind in a role (except #{ALLOWED_DUPLICATE_KINDS.join(" and ")})"
     end
 
     def validate_api_version
@@ -257,14 +252,6 @@ def validate_host_volume_paths
 
     # helpers below
 
-    # [1,2,3,1,4] -> [2,3,4,1]
-    def uniq_element!(array, element)
-      if array.count(element) > 1
-        array.delete(element)
-        array << element
-      end
-    end
-
     def find_stateful_set
       @elements.detect { |t| t[:kind] == "StatefulSet" }
     end

diff --git a/plugins/kubernetes/app/models/kubernetes/template_filler.rb b/plugins/kubernetes/app/models/kubernetes/template_filler.rb
@@ -24,7 +24,11 @@ def to_hash(verification: false)
 
         case kind
         when 'HorizontalPodAutoscaler'
+          set_name
           set_hpa_scale_target_name
+        when 'ConfigMap' # rubocop:disable Lint/EmptyWhen
+          # referenced in other resources so we cannot change the name
+          # NOTE: may cause multiple projects to override each others ConfigMaps if they chose duplicate names
         when *Kubernetes::RoleConfigFile::SERVICE_KINDS
           set_service_name
           prefix_service_cluster_ip
@@ -53,6 +57,8 @@ def to_hash(verification: false)
           set_image_pull_secrets
           set_resource_blue_green if blue_green_color
           set_init_containers
+        else
+          set_name
         end
         template
       end
@@ -121,7 +127,9 @@ def set_service_name
     end
 
     def generate_service_name(config_name)
+      # when no service name was chosen we use the name from the config, which could lead to duplication
       return config_name unless name = @doc.kubernetes_role.service_name.presence
+
       if name.include?(Kubernetes::Role::GENERATED)
         raise(
           Samson::Hooks::UserError,