kubernetes-deploy 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 229024d6a43f085c767d9943c3cb06ae3f965995
-  data.tar.gz: b5a48ab5bd5dd40ae1bf1d628f9c159083964e6a
+  metadata.gz: 29573aea8ad1792ad61ec614c01d86b8a1a4b42c
+  data.tar.gz: c626801864c77a1879d922c9140c16f1e8d203d6
 SHA512:
-  metadata.gz: d62b6779527427b81fd95ecd6bc421177ef16637d9bf227c400848971a5f3fe484cb54473adde550f97112b999366b5e0346740b8f8e648fa26e6c0e38582f36
-  data.tar.gz: 0a6625137be4640bbe140bcbbed8012ebd3e36442dc1b6ecbc0ea5cb6e5e844ee931eff4df4314f3c0d65fb94c64ccd9c9f43b38ac1093aec0e42753d7797c7b
+  metadata.gz: 4ba1893e0ff7cdf82eaffec1ded3cd3efe46409f0c05d8e9a2f67cca6f0777798f8184351c64bd922de651a2ef51b78d480edf677741a0b6cb392b1fee102156
+  data.tar.gz: 12761dfb12a052f1cc8971e10c881c36fcdfb4c69c7bb8aa492fa6b36b4b6e5f9a23cb47b53030097af21438fa2489ac04f7c0cb29e97fabde293ecc94ee9157

data/lib/kubernetes-deploy.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/string/inflections'
 
 require 'logger'
 require 'kubernetes-deploy/runner'

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -12,6 +12,7 @@ module KubernetesDeploy
 
     def self.for_type(type, name, namespace, file)
       case type
+      when 'cloudsql' then Cloudsql.new(name, namespace, file)
       when 'configmap' then ConfigMap.new(name, namespace, file)
       when 'deployment' then Deployment.new(name, namespace, file)
       when 'pod' then Pod.new(name, namespace, file)
@@ -69,6 +70,10 @@ module KubernetesDeploy
       !deploy_succeeded? && !deploy_failed? && (Time.now.utc - @deploy_started > self.class::TIMEOUT)
     end
 
+    def tpr?
+      false
+    end
+
     def status_data
       {
         group: group_name,
@@ -82,7 +87,7 @@ module KubernetesDeploy
     end
 
     def group_name
-      type + "s"
+      type.downcase.pluralize
     end
 
     def run_kubectl(*args)

data/lib/kubernetes-deploy/kubernetes_resource/cloudsql.rb

@@ -0,0 +1,69 @@
+module KubernetesDeploy
+  class Cloudsql < KubernetesResource
+    TIMEOUT = 5.minutes
+
+    def initialize(name, namespace, file)
+      @name, @namespace, @file = name, namespace, file
+    end
+
+    def sync
+      _, st = run_kubectl("get", type, @name)
+      @found = st.success?
+      @status = if cloudsql_proxy_deployment_exists? && mysql_service_exists?
+        "Provisioned"
+      else
+        "Unknown"
+      end
+
+      log_status
+    end
+
+    def deploy_succeeded?
+      cloudsql_proxy_deployment_exists? && mysql_service_exists?
+    end
+
+    def deploy_failed?
+      false
+    end
+
+    def tpr?
+      true
+    end
+
+    def exists?
+      @found
+    end
+
+    private
+    def cloudsql_proxy_deployment_exists?
+      deployment, st = run_kubectl("get", "deployments", "cloudsql-proxy", "-o=json")
+
+      if st.success?
+        parsed = JSON.parse(deployment)
+
+        if parsed.fetch("status", {}).fetch("availableReplicas", -1) == parsed.fetch("status", {}).fetch("replicas", 0)
+          # all cloudsql-proxy pods are running
+          return true
+        end
+      end
+
+      false
+    end
+
+    def mysql_service_exists?
+      service, st = run_kubectl("get", "services", "mysql", "-o=json")
+
+      if st.success?
+        parsed = JSON.parse(service)
+
+        if parsed.fetch("spec", {}).fetch("clusterIP", "") != ""
+          # the service has an assigned cluster IP and is therefore functioning
+          return true
+        end
+      end
+
+      false
+    end
+
+  end
+end

data/lib/kubernetes-deploy/runner.rb

@@ -7,6 +7,7 @@ require 'tempfile'
 
 require 'kubernetes-deploy/kubernetes_resource'
 %w(
+  cloudsql
   config_map
   deployment
   ingress
@@ -20,6 +21,7 @@ end
 module KubernetesDeploy
   class Runner
     PREDEPLOY_SEQUENCE = %w(
+      Cloudsql
       ConfigMap
       PersistentVolumeClaim
       Pod
@@ -59,7 +61,6 @@ MSG
       @namespace = namespace
       @context = context
       @current_sha = current_sha
-
       @template_dir = File.expand_path(template_dir)
       # Max length of podname is only 63chars so try to save some room by truncating sha to 8 chars
       @id = current_sha[0...8] + "-#{SecureRandom.hex(4)}" if current_sha
@@ -134,7 +135,7 @@ MSG
     end
 
     def discover_resource_via_dry_run(tempfile)
-      resource_id, err, st = run_kubectl("apply", "-f", tempfile.path, "--dry-run", "--output=name")
+      resource_id, err, st = run_kubectl("create", "-f", tempfile.path, "--dry-run", "--output=name")
       raise FatalDeploymentError, "Dry run failed for template #{File.basename(tempfile.path)}." unless st.success?
       resource_id
     end
@@ -226,10 +227,27 @@ MSG
       KubernetesDeploy.logger.info("All required parameters and files are present")
     end
 
+    def update_tprs(resources)
+      resources.each do |r|
+        KubernetesDeploy.logger.info("- #{r.id}")
+        r.deploy_started = Time.now.utc
+        _, _, st = run_kubectl("replace", "-f", r.file.path)
+
+        unless st.success?
+          # it doesn't exist so we can't replace it
+          run_kubectl("create", "-f", r.file.path)
+        end
+      end
+    end
+
     def deploy_resources(resources, prune: false)
-      command = ["apply", "--namespace=#{@namespace}"]
+      command = ["apply"]
       KubernetesDeploy.logger.info("Deploying resources:")
 
+      # TPRs must use update for now: https://github.com/kubernetes/kubernetes/issues/39906
+      tprs, resources = resources.partition(&:tpr?)
+      update_tprs(tprs)
+
       resources.each do |r|
         KubernetesDeploy.logger.info("- #{r.id}")
         command.push("-f", r.file.path)

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Kir Shatrov
@@ -87,6 +87,7 @@ files:
 - kubernetes-deploy.gemspec
 - lib/kubernetes-deploy.rb
 - lib/kubernetes-deploy/kubernetes_resource.rb
+- lib/kubernetes-deploy/kubernetes_resource/cloudsql.rb
 - lib/kubernetes-deploy/kubernetes_resource/config_map.rb
 - lib/kubernetes-deploy/kubernetes_resource/deployment.rb
 - lib/kubernetes-deploy/kubernetes_resource/ingress.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kubernetes deploy scripts