hippo-cli 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 432cb14031538080436b685d9bffb44890296eb4ee2e001f47112d0a60cf10ae
-  data.tar.gz: 155f1cfd1ef594b9ad3e863bb40c3ca89df2bbbb77a5b3657ea6abd4dd324d39
+  metadata.gz: 4d9636ec9f0d56f6cd5633d73bee77605fb30383c3bd5d793c6245db0720b30a
+  data.tar.gz: d1dbc5b162c243d4cc1806e8d15ce5e7f59a7ad631d0ac75986e1003afcc5380
 SHA512:
-  metadata.gz: dbf149c3462eaf4b7b2fcba7afe450d3a60c472a671ba117a991db9db2ae7b94d3f72c2e2f708cc2d316f1dcadb00e5a60e637bdf3d9dc27af724e5f7595da33
-  data.tar.gz: ce1c8ab412478c7d4dc13a3d975d2734c2ad60a75dfd43e60b95fec1c9493a232036056977e395ee6da021a871fef51c7827419eb11395e6c296475a537601ce
+  metadata.gz: 65da298f8f79ba3b5bf954e67283d8aa5340b0f02276c1c85110f7fcdba305dc64a8aee0075196a1bdf807476d9282ae3211174ad21c6d2708286b44784b87bc
+  data.tar.gz: 9ec88a924598b71181da03ea899adec5472633d97eee8cae6c57bf30e8cf833df93458177ba096937aa7f2f834ac0b06f70051a041fae80af5fc661c0a0fa1ea

data/cli/kubectl.rb

@@ -10,7 +10,8 @@ command :kubectl do
   action do |context|
     require 'hippo/cli_steps'
     cli = Hippo::CLISteps.setup(context)
-    ARGV.shift
+    ARGV.shift(2)
+    ARGV.delete('--')
     exec cli.stage.kubectl(*ARGV)
   end
 end

data/cli/objects.rb

@@ -26,7 +26,7 @@ command :objects do
     types.each do |type|
       next unless Hippo::Kubernetes::OBJECT_DIRECTORY_NAMES.include?(type)
 
-      objects |= steps.recipe.kubernetes.objects(type, steps.stage, commit)
+      objects += steps.recipe.kubernetes.objects(type, steps.stage, commit, deploy_id: 'preview')
     end
 
     puts objects.map { |o| o.hash.to_yaml }

data/lib/hippo/cli_steps.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'open3'
+require 'digest'
 require 'hippo/error'
 require 'hippo/recipe'
 
@@ -60,7 +61,8 @@ module Hippo
           command = [
             'docker', 'build', '.',
             '-f', build_spec.dockerfile,
-            '-t', image_name
+            '-t', image_name,
+            '--build-arg', "commit_ref=#{@commit.objectish}"
           ]
           external_command do
             if system(*command)
@@ -110,23 +112,62 @@ module Hippo
 
     def deploy
       action 'Applying deployments'
-      deployments = @recipe.kubernetes.objects('deployments', @stage, @commit)
+      @deploy_id = Digest::SHA1.hexdigest(Time.now.to_f.to_s)[0, 10]
+      deployments = @recipe.kubernetes.objects('deployments', @stage, @commit, deploy_id: @deploy_id)
 
       if deployments.nil?
         info 'No deployments file configured. Not applying any deployments'
       end
 
       external_command do
-        @recipe.kubernetes.apply_with_kubectl(deployments)
+        @recipe.kubernetes.apply_with_kubectl(@stage, deployments)
       end
       success 'Deployments applied successfully'
-      puts 'You can watch the deployment progressing using the command below:'
-      puts
-      puts "  ⏰  #{@stage.kubectl('get pods --watch')}"
-      deployments.each do |deployment|
-        puts '  👩🏼‍💻  ' + @stage.kubectl("describe deployment #{deployment['metadata']['name']}")
+      puts 'Waiting for all deployments to rollout...'
+
+      count = 0
+      loop do
+        sleep 4
+        count += 1
+        replica_sets = @recipe.kubernetes.get_with_kubectl(@stage, [
+                                                             'rs',
+                                                             '--selector',
+                                                             'hippo.adam.ac/deployID=' + @deploy_id
+                                                           ])
+        pending_replica_sets = replica_sets.reject do |deploy|
+          deploy['status']['availableReplicas'] == deploy['status']['replicas']
+        end
+
+        names = replica_sets.map { |d| d['metadata']['name'].split('-').first }.join(', ')
+
+        if pending_replica_sets.empty?
+          success 'All deployments have rolled out successfully.'
+          puts
+          replica_sets.each do |rs|
+            name = rs['metadata']['name'].split('-').first
+            quantity = rs['status']['availableReplicas']
+            puts "  * \e[35m#{name}\e[0m has #{quantity} #{quantity == 1 ? 'replica' : 'replicas'}"
+          end
+          puts
+          break
+        else
+          if count == 15
+            error "Looks like things aren't going to plan with some deployments."
+            puts 'You can review potential issues using the commads below:'
+            pending_replica_sets.each do |rs|
+              puts
+              name = rs['metadata']['name'].split('-').first
+              puts "  hippo #{stage.name} kubectl -- describe deployment \e[35m#{name}\e[0m"
+              puts "  hippo #{stage.name} kubectl -- logs deployment/\e[35m#{name}\e[0m --all-containers"
+            end
+            puts
+
+            break
+          else
+            puts 'Waiting for ' + pending_replica_sets.map { |rs| rs['metadata']['name'].split('-').first }.join(', ')
+          end
+        end
       end
-      puts
     end
 
     def apply_services
@@ -136,7 +177,7 @@ module Hippo
         info 'No services have been defined'
       else
         external_command do
-          @recipe.kubernetes.apply_with_kubectl(objects)
+          @recipe.kubernetes.apply_with_kubectl(@stage, objects)
         end
         success 'Services applied successfully'
       end
@@ -155,7 +196,7 @@ module Hippo
         info 'No configuration files have been defined'
       else
         external_command do
-          @recipe.kubernetes.apply_with_kubectl(objects)
+          @recipe.kubernetes.apply_with_kubectl(@stage, objects)
         end
         success 'Configuration applied successfully'
       end
@@ -172,7 +213,7 @@ module Hippo
 
       yamls = manager.secrets.map(&:to_secret_yaml).join("---\n")
       external_command do
-        @recipe.kubernetes.apply_with_kubectl(yamls)
+        @recipe.kubernetes.apply_with_kubectl(@stage, yamls)
       end
       success 'Secrets applicated successfully'
     end
@@ -218,7 +259,7 @@ module Hippo
           @recipe.kubernetes.delete_job(@stage, job['metadata']['name'])
         end
 
-        result = @recipe.kubernetes.apply_with_kubectl(objects)
+        result = @recipe.kubernetes.apply_with_kubectl(@stage, objects)
       end
 
       puts 'Waiting for all scheduled jobs to finish...'

data/lib/hippo/kubernetes.rb

@@ -22,7 +22,7 @@ module Hippo
     # @param commit [String] the commit ref
     # @param path [String]
     # @return
-    def objects(path, stage, commit)
+    def objects(path, stage, commit, deploy_id: nil)
       time = Time.now
 
       yamls = load_yaml_from_directory(path)
@@ -38,28 +38,33 @@ module Hippo
           object['metadata']['namespace'] = stage.namespace
         end
 
-        # Add our own details to the metadata of all objets created by us so
-        # we know where they came from.
         object['metadata']['annotations'] ||= {}
-        object['metadata']['annotations']['hippo.adam.ac/builtAt'] ||= time.to_s
-        object['metadata']['annotations']['hippo.adam.ac/builtBy'] ||= ENV['USER'] || 'unknown'
+        object['metadata']['labels'] ||= {}
 
         add_default_labels(object, stage)
 
         # Add some information to Deployments to reflect the latest
         # information about this deployment.
         if object['kind'] == 'Deployment'
-          object['metadata']['annotations']['hippo.adam.ac/deployID'] ||= time.to_i.to_s
+          if deploy_id
+            object['metadata']['labels']['hippo.adam.ac/deployID'] ||= deploy_id
+          end
+
           if commit
             object['metadata']['annotations']['hippo.adam.ac/commitRef'] ||= commit.objectish
             object['metadata']['annotations']['hippo.adam.ac/commitMessage'] ||= commit.message
           end
 
           if pod_metadata = object.dig('spec', 'template', 'metadata')
+            pod_metadata['labels'] ||= {}
             pod_metadata['annotations'] ||= {}
-            pod_metadata['annotations']['hippo.adam.ac/deployID'] ||= time.to_i.to_s
+            # add_default_labels(pod_metadata, stage)
+            if deploy_id
+              pod_metadata['labels']['hippo.adam.ac/deployID'] = deploy_id
+            end
+
             if commit
-              pod_metadata['annotations']['hippo.adam.ac/commitRef'] ||= commit.objectish
+              pod_metadata['annotations']['hippo.adam.ac/commitRef'] = commit.objectish
             end
           end
         end
@@ -77,20 +82,24 @@ module Hippo
         }
       }
       add_default_labels(namespace, stage)
-      apply_with_kubectl(namespace.to_yaml)
+      apply_with_kubectl(stage, namespace.to_yaml)
     end
 
     # Apply the given configuration with kubectl
     #
     # @param config [Array<Hippo::YAMLPart>, String]
     # @return [void]
-    def apply_with_kubectl(yaml_parts)
+    def apply_with_kubectl(stage, yaml_parts)
       unless yaml_parts.is_a?(String)
         yaml_parts = [yaml_parts] unless yaml_parts.is_a?(Array)
         yaml_parts = yaml_parts.map { |yp| yp.hash.to_yaml }.join("\n---\n")
       end
 
-      Open3.popen3('kubectl apply -f -') do |stdin, stdout, stderr, wt|
+      command = ['kubectl']
+      command += ['--context', stage.context] if stage.context
+      command += ['apply', '-f', '-']
+
+      Open3.popen3(command.join(' ')) do |stdin, stdout, stderr, wt|
         stdin.puts yaml_parts
         stdin.close
 
@@ -117,13 +126,9 @@ module Hippo
     # @raises [Hippo::Error]
     # @return [Array<Hash>]
     def get_with_kubectl(stage, *names)
-      command = [
-        'kubectl',
-        '-n', stage.namespace,
-        'get',
-        names,
-        '-o', 'yaml'
-      ].flatten.reject(&:nil?)
+      command = stage.kubectl_base_command
+      command += ['get', names, '-o', 'yaml']
+      command = command.flatten.reject(&:nil?)
 
       Open3.popen3(*command) do |_, stdout, stderr, wt|
         if wt.value.success?
@@ -142,13 +147,8 @@ module Hippo
     # @raises [Hippo::Error]
     # @return [void]
     def delete_job(stage, name)
-      command = [
-        'kubectl',
-        '-n', stage.namespace,
-        'delete',
-        'job',
-        name
-      ]
+      command = stage.kubectl_base_command
+      command += ['delete', 'job', name]
 
       Open3.popen3(*command) do |_, stdout, stderr, wt|
         if wt.value.success?

data/lib/hippo/repository.rb

@@ -23,7 +23,7 @@ module Hippo
 
       @path ||= begin
         digest = Digest::SHA256.hexdigest(url)
-        File.join('', 'tmp', 'hippo-repos', digest)
+        File.join(ENV['HOME'], '.hippo', 'repos', digest)
       end
     end
 

data/lib/hippo/secret_manager.rb

@@ -34,7 +34,7 @@ module Hippo
         'metadata' => { 'name' => 'hippo-secret-key', 'namespace' => @stage.namespace },
         'data' => { 'key' => Base64.encode64(secret_key64).gsub("\n", '').strip }
       }
-      @recipe.kubernetes.apply_with_kubectl(object.to_yaml)
+      @recipe.kubernetes.apply_with_kubectl(@stage, object.to_yaml)
       @key = secret_key
     end
 

data/lib/hippo/stage.rb

@@ -18,6 +18,10 @@ module Hippo
       @options['namespace']
     end
 
+    def context
+      @options['context']
+    end
+
     def template_vars
       {
         'name' => name,
@@ -28,7 +32,14 @@ module Hippo
     end
 
     def kubectl(*command)
-      "kubectl -n #{namespace} #{command.join(' ')}"
+      (kubectl_base_command + command).join(' ')
+    end
+
+    def kubectl_base_command
+      command = ['kubectl']
+      command += ['--context', context] if context
+      command += ['-n', namespace]
+      command
     end
   end
 end

data/lib/hippo/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hippo
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hippo-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Cooke
@@ -30,7 +30,7 @@ cert_chain:
   3wUJNGnT5XYq+qvTqmjkTSTfdGvZCM63C6bGdN5CAyMokGOOatGqyCMAONolWnfC
   gm3t2GWWrxY=
   -----END CERTIFICATE-----
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git