kuby-kube-db 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4948f767c31be6c14b6a9a31cf63e374afb3996cd37697576ac2c527ca27351
-  data.tar.gz: 5992a1179de471e76d14d275c4c2de230b176b9f86b5c3b58ce48d02b9405c90
+  metadata.gz: 410cd6089e3ecf3de0324d3969ad8afa36a3787f962c664957fcad5d90629d58
+  data.tar.gz: ed650147e64258ebf60b350168ce9df7e389393134cf554c6d3893dcafafc26d
 SHA512:
-  metadata.gz: e1d47996d8f5e155b64b7c26465869c35d26fad02c17b60d016346a92e0cc6035e8daeeb81df3bfb721f7a486bb2923ca6bddd6a1bcd81d4c9b0c3affec966a6
-  data.tar.gz: 19aed56496c8c075a3a70c6ae753a0046139f2dcea859663326ac9d98d01e3e9dcf33169d47e6d8fdd3c92036a6328f473685eba9a1867d6be1807611e674321
+  metadata.gz: 05cd94f38afede349d7c63a08eac7d96435a924a5d912e97bad63e869660d71c9b87a84c1c7941c30eadb7107695c8c61342909b11f0d6560d4c6ee193a82181
+  data.tar.gz: e8b8a3a13b4023a2f237096e14773e60c3d0e75493c9dcaaad2bac3df383e4c2a1eee451e1076ea94cad477a9ac918eccd681ed470448762e7fcd9bccdcfbf07

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.0
+* Wait for API resources to become available.
+  - Krane queries k8s for API resources which causes kubectl to exit with a non-zero status code if KubeDB's operator isn't finished spinning up.
+
 ## 0.5.0
 * Conform to new plugin architecture.
 * Accept `environment` instead of `definition` instances.

data/kuby-kube-db.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.platform = Gem::Platform::RUBY
 
-  s.add_dependency 'helm-cli', '~> 0.2'
+  s.add_dependency 'helm-cli', '~> 0.3'
   s.add_dependency 'kube-dsl', '~> 0.3'
 
   s.require_path = 'lib'

data/lib/kuby/kube-db/plugin.rb

@@ -6,6 +6,7 @@ module Kuby
   module KubeDB
     class KubeDBError < StandardError; end
     class OperatorDeployError < KubeDBError; end
+    class APIResourcesError < KubeDBError; end
 
     class Plugin < ::Kuby::Plugin
       NAMESPACE = 'kube-system'.freeze
@@ -16,8 +17,8 @@ module Kuby
       CATALOG_RELEASE_NAME = 'kubedb-catalog'.freeze
       OPERATOR_CHART_NAME = 'appscode/kubedb'.freeze
       CATALOG_CHART_NAME = 'appscode/kubedb-catalog'.freeze
-      OPERATOR_WAIT_INTERVAL = 5  # seconds
-      OPERATOR_WAIT_MAX = 60      # seconds
+      WAIT_INTERVAL = 5  # seconds
+      WAIT_MAX = 120     # seconds
 
       OPERATOR_PARAMS = {
         'apiserver.enableValidatingWebhook' => 'true',
@@ -40,6 +41,10 @@ module Kuby
           Kuby.logger.info('Waiting for kubedb operator deployment')
         end
 
+        wait_for_api_resources do
+          Kuby.logger.info('Waiting for API resources to become available')
+        end
+
         Kuby.logger.info('Deploying kubedb catalog')
         catalog_deployed? ? upgrade_catalog : install_catalog
 
@@ -88,15 +93,35 @@ module Kuby
         loop do
           break if operator_ready?
 
-          if time_elapsed >= OPERATOR_WAIT_MAX
+          if time_elapsed >= WAIT_MAX
             raise OperatorDeployError, 'timeout waiting for operator to start. '\
               "Waited #{time_elapsed}s."
           end
 
           yield
 
-          sleep OPERATOR_WAIT_INTERVAL
-          time_elapsed += OPERATOR_WAIT_INTERVAL
+          sleep WAIT_INTERVAL
+          time_elapsed += WAIT_INTERVAL
+        end
+      end
+
+      def wait_for_api_resources
+        time_elapsed = 0
+
+        loop do
+          begin
+            if time_elapsed >= WAIT_MAX
+              raise APIResourcesError, 'timeout waiting for API resources to '\
+                "become available. Waited #{time_elapsed}s."
+            end
+
+            kubernetes_cli.api_resources
+            break
+          rescue KubernetesCLI::KubernetesError
+            yield
+            sleep WAIT_INTERVAL
+            time_elapsed += WAIT_INTERVAL
+          end
         end
       end
 
@@ -168,7 +193,7 @@ module Kuby
       end
 
       def helm_cli
-        @helm_cli ||= HelmCLI.new(provider.kubeconfig_path)
+        provider.helm_cli
       end
 
       def kubernetes_cli

data/lib/kuby/kube-db/version.rb

@@ -1,6 +1,6 @@
 module Kuby
   module KubeDB
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
     KUBEDB_VERSION = '0.12.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-kube-db
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: helm-cli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: kube-dsl
   requirement: !ruby/object:Gem::Requirement