Opitmize migration process by using both unmanaged_kubernetes_service and kubernetes_service_without_template

db/post_migrate/20171124104327_migrate_kubernetes_service_to_new_clusters_architectures.rb

@@ -54,7 +54,21 @@ class MigrateKubernetesServiceToNewClustersArchitectures < ActiveRecord::Migrati
 
     belongs_to :project, class_name: 'MigrateKubernetesServiceToNewClustersArchitectures::Project'
 
-    scope :kubernetes_service, -> do
+    scope :unmanaged_kubernetes_service, -> do
+      where(category: 'deployment')
+      .where(type: 'KubernetesService')
+      .where(template: false)
+      .where("NOT EXISTS (?)",
+        MigrateKubernetesServiceToNewClustersArchitectures::PlatformsKubernetes
+          .joins('INNER JOIN projects ON projects.id = services.project_id')
+          .joins('INNER JOIN cluster_projects ON cluster_projects.project_id = projects.id')
+          .where('cluster_projects.cluster_id = cluster_platforms_kubernetes.cluster_id')
+          .where("services.properties LIKE CONCAT('%', cluster_platforms_kubernetes.api_url, '%')")
+          .select('1') )
+      .order(project_id: :asc)
+     end
+
+    scope :kubernetes_service_without_template, -> do
       where(category: 'deployment')
       .where(type: 'KubernetesService')
       .where(template: false)
@@ -78,17 +92,9 @@ class MigrateKubernetesServiceToNewClustersArchitectures < ActiveRecord::Migrati
     end
   end
 
-  # KubernetesService might be already managed by clusters
-  def managed_by_clusters?(kubernetes_service)
-    kubernetes_service.project.clusters
-      .joins('INNER JOIN cluster_platforms_kubernetes ON clusters.id = cluster_platforms_kubernetes.cluster_id')
-      .where('cluster_platforms_kubernetes.api_url = ?', kubernetes_service.api_url)
-      .exists?
-  end
-
   def up
-    MigrateKubernetesServiceToNewClustersArchitectures::Service.kubernetes_service.find_each(batch_size: 1) do |kubernetes_service|
+    MigrateKubernetesServiceToNewClustersArchitectures::Service
-      unless managed_by_clusters?(kubernetes_service)
+      .unmanaged_kubernetes_service.find_each(batch_size: 1) do |kubernetes_service|
       MigrateKubernetesServiceToNewClustersArchitectures::Cluster.create(
         enabled: kubernetes_service.active,
         user_id: nil, # KubernetesService doesn't have
@@ -108,11 +114,7 @@ class MigrateKubernetesServiceToNewClustersArchitectures < ActiveRecord::Migrati
         } )
     end
 
-      # Disable the KubernetesService. Platforms::Kubernetes will be used from next time.
+    MigrateKubernetesServiceToNewClustersArchitectures::Service.kubernetes_service_without_template.update_all(active: false)
-      kubernetes_service.active = false
-      kubernetes_service.properties.merge!( { migrated: true } )
-      kubernetes_service.save!
-    end
   end
 
   def down

spec/migrations/migrate_kubernetes_service_to_new_clusters_architectures_spec.rb

@@ -28,7 +28,6 @@ describe MigrateKubernetesServiceToNewClustersArchitectures, :migration do
             expect(cluster.platform_kubernetes.ca_pem).to eq(project.kubernetes_service.ca_pem)
             expect(cluster.platform_kubernetes.token).to eq(project.kubernetes_service.token)
             expect(project.kubernetes_service).not_to be_active
-            expect(project.kubernetes_service.properties['migrated']).to be_truthy
           end
         end
       end
@@ -85,7 +84,6 @@ describe MigrateKubernetesServiceToNewClustersArchitectures, :migration do
           expect(cluster.platform_kubernetes.ca_pem).to eq(project.kubernetes_service.ca_pem)
           expect(cluster.platform_kubernetes.token).to eq(project.kubernetes_service.token)
           expect(project.kubernetes_service).not_to be_active
-          expect(project.kubernetes_service.properties['migrated']).to be_truthy
         end
       end
     end
@@ -110,7 +108,6 @@ describe MigrateKubernetesServiceToNewClustersArchitectures, :migration do
 
       kubernetes_service.reload
       expect(kubernetes_service).not_to be_active
-      expect(kubernetes_service.properties['migrated']).to be_truthy
     end
   end
 
@@ -129,7 +126,6 @@ describe MigrateKubernetesServiceToNewClustersArchitectures, :migration do
         expect(cluster.platform_kubernetes.ca_pem).to eq(kubernetes_service.ca_pem)
         expect(cluster.platform_kubernetes.token).to eq(kubernetes_service.token)
         expect(kubernetes_service).not_to be_active
-        expect(kubernetes_service.properties['migrated']).to be_truthy
       end
     end
   end
@@ -149,7 +145,6 @@ describe MigrateKubernetesServiceToNewClustersArchitectures, :migration do
         expect(cluster.platform_kubernetes.ca_pem).to eq(kubernetes_service.ca_pem)
         expect(cluster.platform_kubernetes.token).to eq(kubernetes_service.token)
         expect(kubernetes_service).not_to be_active
-        expect(kubernetes_service.properties['migrated']).to be_truthy
       end
     end
   end
@@ -170,7 +165,6 @@ describe MigrateKubernetesServiceToNewClustersArchitectures, :migration do
         expect(cluster.platform_kubernetes.ca_pem).to eq(kubernetes_service.ca_pem)
         expect(cluster.platform_kubernetes.token).to eq(kubernetes_service.token)
         expect(kubernetes_service).not_to be_active
-        expect(kubernetes_service.properties['migrated']).to be_truthy
       end
     end
   end