Merge branch '60550-make-application-data-plain-module' into 'master'

Make ApplicationData a plain module include

Closes #60550

See merge request gitlab-org/gitlab-ce!28387

app/models/clusters/concerns/application_data.rb

@@ -3,56 +3,52 @@
 module Clusters
   module Concerns
     module ApplicationData
-      extend ActiveSupport::Concern
-
-      included do
-        def uninstall_command
-          Gitlab::Kubernetes::Helm::DeleteCommand.new(
-            name: name,
-            rbac: cluster.platform_kubernetes_rbac?,
-            files: files
-          )
-        end
+      def uninstall_command
+        Gitlab::Kubernetes::Helm::DeleteCommand.new(
+          name: name,
+          rbac: cluster.platform_kubernetes_rbac?,
+          files: files
+        )
+      end
 
-        def repository
-          nil
-        end
+      def repository
+        nil
+      end
 
-        def values
-          File.read(chart_values_file)
-        end
+      def values
+        File.read(chart_values_file)
+      end
 
-        def files
-          @files ||= begin
-            files = { 'values.yaml': values }
+      def files
+        @files ||= begin
+          files = { 'values.yaml': values }
 
-            files.merge!(certificate_files) if cluster.application_helm.has_ssl?
+          files.merge!(certificate_files) if cluster.application_helm.has_ssl?
 
-            files
-          end
+          files
         end
+      end
 
-        private
+      private
 
-        def certificate_files
-          {
-            'ca.pem': ca_cert,
-            'cert.pem': helm_cert.cert_string,
-            'key.pem': helm_cert.key_string
-          }
-        end
+      def certificate_files
+        {
+          'ca.pem': ca_cert,
+          'cert.pem': helm_cert.cert_string,
+          'key.pem': helm_cert.key_string
+        }
+      end
 
-        def ca_cert
-          cluster.application_helm.ca_cert
-        end
+      def ca_cert
+        cluster.application_helm.ca_cert
+      end
 
-        def helm_cert
-          @helm_cert ||= cluster.application_helm.issue_client_cert
-        end
+      def helm_cert
+        @helm_cert ||= cluster.application_helm.issue_client_cert
+      end
 
-        def chart_values_file
-          "#{Rails.root}/vendor/#{name}/values.yaml"
-        end
+      def chart_values_file
+        "#{Rails.root}/vendor/#{name}/values.yaml"
       end
     end
   end