picsolve_docker_builder 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff6dc295b2b3965dc57e04b6939e98c6e39028f6
-  data.tar.gz: fa1feef27218916f7c8ea253b43495645089c0fc
+  metadata.gz: b5054af6f95aeaf16fa2778e2cce3ab643278fd6
+  data.tar.gz: f7a182c402001931a9d1c7782461c47d45937b4a
 SHA512:
-  metadata.gz: 610fb9fd6451749f7c11aaf818ca6a39d578617a45a65e915e25d69266d3c40f2114d76df9e76387283478d5650c63c086c6e1b8488c8fa8439108b9c028e265
-  data.tar.gz: 731f2eeafe0e07ca9bc4cae992eda2022a3c9a9add0b499321f1f874c25e14fd6f796e5a269bc040d44799e86450f99742a831293a153db3de84049016b4395e
+  metadata.gz: d79c083d740bd2edfe11ddbf7ad49e7321e474beb0c168f72f5311fdc9cb9d3bdd792ddb392e7c736d06f449df7892b62f267596ed28ee85627dfb7d2f15e6e4
+  data.tar.gz: b392c2ceee3297c4a2f5f9770b6a5ad2ae0310993280e0ab65206be1578a1bb833e063829e38f3d5f36c6d2acd2a7b7ee6e262a3eca45c0966b49bfe629bc8ee

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.5.2] - 2016-03-08
+### Added
+- Support for cleaning up ci/test stage databases and replication controllers
+
 ## [0.5.1] - 2016-03-07
 ### Added
 - Support for storing/updateing tag information within config file

data/lib/picsolve_docker_builder/composer/composer.rb

@@ -55,6 +55,15 @@ module PicsolveDockerBuilder
         end
       end
 
+      def cleanup
+        kubernetes_clusters.each do |cluster|
+          begin
+            log.info "Cleanup kubernetes cluster #{cluster.host}"
+            cluster.cleanup
+          end
+        end
+      end
+
       def deploy
         errors = 0
         kubernetes_clusters.each do |cluster|

data/lib/picsolve_docker_builder/composer/requirements/base.rb

@@ -37,6 +37,10 @@ module PicsolveDockerBuilder
           SecureRandom.urlsafe_base64(length)
         end
 
+        def delete_secret(name)
+          kubernetes.client.delete_secret name, namespace
+        end
+
         def create_secret(name, obj)
           secret = Kubeclient::Secret.new
           secret.metadata = {

data/lib/picsolve_docker_builder/composer/requirements/postgres.rb

@@ -28,20 +28,27 @@ module PicsolveDockerBuilder
           create_postgres_secret
         end
 
+        # ssh port forward
+        def forward
+          return @forward unless @forward.nil?
+          @forward = ssh_forward(
+            admin_postgres_secret['host'],
+            admin_postgres_secret['port'].to_i
+          )
+          @forward
+        end
+
         # create a new postgres secret and create the according database
         def create_postgres_secret
-          admin_secret = admin_postgres_secret
-
           log.info "Create secret for #{user_and_db_name} database"
           container_secret = {
             'name' => user_and_db_name,
             'user' => user_and_db_name,
             'password' => gen_password,
-            'host' => admin_secret['host'],
-            'port' => admin_secret['port']
+            'host' => admin_postgres_secret['host'],
+            'port' => admin_postgres_secret['port']
           }
           create_postgres_database(
-            admin_secret,
             container_secret
           )
           create_secret(
@@ -51,39 +58,80 @@ module PicsolveDockerBuilder
           container_secret
         end
 
-        # create postgres database
-        # rubocop:disable Metrics/MethodLength
-        def create_postgres_database(admin_secret, container_secret)
-          log.info "Create database #{user_and_db_name}"
-
-          forward = ssh_forward(admin_secret['host'], admin_secret['port'].to_i)
+        def create_admin_conn
+          admin_secret = admin_postgres_secret.clone
           admin_secret['host'] = '127.0.0.1'
           admin_secret['port'] = forward.local_port
+          log.info 'open postgres connection to ' \
+            "#{admin_secret['host']}:#{admin_secret['port']}" \
+            " with user #{admin_secret['user']}"
+          PG::Connection.open(admin_secret)
+        end
 
-          conn = PG::Connection.open(admin_secret)
+        def admin_conn
+          @admin_conn ||= create_admin_conn
+        end
 
-          user = conn.escape_string(container_secret['user'])
-          password = conn.escape_string(container_secret['password'])
-          name = conn.escape_string(container_secret['name'])
+        def admin_conn_close
+          admin_conn.close
+          @admin_conn = nil
+        end
+
+        # cleanup postgres database
+        def cleanup_postgres_database
+          dbname = admin_conn.escape_string(user_and_db_name)
+
+          begin
+            sql = "DROP DATABASE \"#{dbname}\";"
+            admin_conn.exec sql
+            log.info "removed database #{user_and_db_name}"
+          rescue
+            log.warn "removing database #{user_and_db_name} failed"
+          end
+
+          begin
+            sql = "DROP USER \"#{dbname}\";"
+            admin_conn.exec sql
+            log.info "removed user #{user_and_db_name}"
+          rescue
+            log.warn "removing user #{user_and_db_name} failed"
+          end
+
+          begin
+            delete_secret user_and_db_name
+            log.info "removed secret #{user_and_db_name}"
+          rescue
+            log.warn "removing secret #{user_and_db_name} failed"
+          end
+        end
+
+        # create postgres database
+        # rubocop:disable Metrics/MethodLength
+        def create_postgres_database(container_secret)
+          log.info "Create database #{user_and_db_name}"
+
+          user = admin_conn.escape_string(container_secret['user'])
+          password = admin_conn.escape_string(container_secret['password'])
+          name = admin_conn.escape_string(container_secret['name'])
 
           # create user
-          conn.exec(
+          admin_conn.exec(
             "CREATE USER \"#{user}\" " \
             "WITH PASSWORD '#{password}'"
           )
 
           # create db
-          conn.exec(
+          admin_conn.exec(
             "CREATE DATABASE \"#{name}\""
           )
 
           # grant all rights to the user and the aws user
-          conn.exec("
+          admin_conn.exec("
             GRANT ALL PRIVILEGES ON DATABASE \"#{name}\" to \"#{user}\";
             GRANT ALL PRIVILEGES ON DATABASE \"#{name}\" to \"rds_superuser\";
           ")
 
-          conn.close
+          admin_conn_close
 
           admin_secret['dbname'] = name
           admin_secret['user'] = user
@@ -110,7 +158,10 @@ module PicsolveDockerBuilder
 
         # get administrative postgres secrets
         def admin_postgres_secret
-          get_secret('postgres').update('dbname' => 'postgres')
+          return @admin_postgres_secret unless @admin_postgres_secret.nil?
+          @admin_postgres_secret = get_secret('postgres')
+          @admin_postgres_secret.update('dbname' => 'postgres')
+          @admin_postgres_secret
         end
 
         def user_and_db_name

data/lib/picsolve_docker_builder/helpers/config_manager.rb

@@ -92,7 +92,6 @@ module PicsolveDockerBuilder
       def read
         @config = default
         @paths.each do |file|
-          puts "my file is '#{@paths}'"
           begin
             yaml = Psych.load_file file
             @config = @config.deep_merge(yaml)

data/lib/picsolve_docker_builder/helpers/kubernetes_manager.rb

@@ -35,6 +35,33 @@ module PicsolveDockerBuilder
         'core'
       end
 
+      def cleanup
+        stages_allowed = %w(ci test)
+        unless stages_allowed.include? stage
+          log.error "Refuse to cleanup in stage #{stage}." \
+            "I only clean up in stages #{stages_allowed.join ', '}"
+          exit 1
+        end
+        log.info "Cleanup databases for '#{app_name}' in '#{stage}'"
+        rcs = []
+        images.each do |i|
+          i.requirements(self).each do |requirements|
+            continue unless  requirements.is_a?(
+              PicsolveDockerBuilder::Composer::Requirements::Postgres
+            )
+            requirements.cleanup_postgres_database
+          end
+          rcs += i.rc(self).existing_rcs
+        end
+
+        log.info "Cleanup replication controllers for '#{app_name}' " \
+        "in '#{stage}'"
+        rcs.each do |rc|
+          rc.remove
+          rc.remove_pods_orphan
+        end
+      end
+
       def create_client
         Kubeclient::Client.new kubernetes_url, 'v1'
       end

data/lib/picsolve_docker_builder/version.rb

@@ -1,4 +1,4 @@
 # version
 module PicsolveDockerBuilder
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/lib/tasks/compose.rake

@@ -30,4 +30,12 @@ namespace :compose do
     require 'picsolve_docker_builder/helpers/config_version_update'
     PicsolveDockerBuilder::Helpers::ConfigVersionUpdate.update_task
   end
+
+  desc 'Cleanup databases/replication_controllers'
+  task :cleanup do
+    @docker_compose ||= PicsolveDockerBuilder::Composer::Composer.new
+    stage = ENV['STAGE'] || 'CI'
+    @docker_compose.stage = stage
+    @docker_compose.cleanup
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picsolve_docker_builder
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Christian Simon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler