kuby-kube-db 0.4.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd2cf5893ff6fd1f960b91010be789aacff74d31f16c2f314c021397e74e220
-  data.tar.gz: 27f99dc8487fd3eaf43c448c57241194d8a33519f9cee7b319bcc5ee55476bca
+  metadata.gz: f9bc44f5af670d509ac4334e4f249ebef97023d1669cc3619739fc7f0dc3e942
+  data.tar.gz: 26f4e0e3f30038e49e321a78bbbb6fc57256f4bd175bf59e56586eee369c21c0
 SHA512:
-  metadata.gz: 03fcc9e1b282a6ca02c8f982cadab5c81e3baeb9b22aa643e44eb1e8e61a1c7dd3e4f26c258b867a73fca8ab076f34f655d49045ab4535547c4fd2c3cb02ebdf
-  data.tar.gz: 4325077c7d3525b95dce13911a8b3af0ac5848217e77935aef9ab9c8b9638d856b2242f63d6e4d7ff80e1eacf8cf0d381e94d9d08bc2316991d21e6e4cc27aee
+  metadata.gz: bd5ce930b3d5eca591e5e29429410401999d75b1774bd0e14a37bc2e26124a2b0f10d1d4ec57d49c5970cbad8fd93ae11d846eecf4175265b26a9248e7920075
+  data.tar.gz: cb41b9ae28bb08e256ee2f4dc08e7b48cea147f4916cda75a8325c53373dfdb1274491f5cdd7891f5ca430dbb8ac187362992c0f56bb9a5b5488f49f4ed9c92d

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.7.0
+* Upgrade to Helm 3.6 via helm-rb.
+* Check operator replica set more effectively by using match labels during lookup.
+
+## 0.6.2
+* Fix bad constant references
+
+## 0.6.1
+* Pass keyword arguments correctly to helm-cli (#1, @rept)
+
+## 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.
+
 ## 0.4.0
 * Downgrade to kubedb 0.12.0, the latest stable release.
   - For some reason, the API spec for 0.13.0.rc-0 was removed from the apimachinery repo.

data/kuby-kube-db.gemspec

@@ -12,7 +12,8 @@ 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 'helm-rb', '~> 0.2'
   s.add_dependency 'kube-dsl', '~> 0.3'
 
   s.require_path = 'lib'

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

@@ -6,8 +6,9 @@ module Kuby
   module KubeDB
     class KubeDBError < StandardError; end
     class OperatorDeployError < KubeDBError; end
+    class APIResourcesError < KubeDBError; end
 
-    class Plugin < ::Kuby::Kubernetes::Plugin
+    class Plugin < ::Kuby::Plugin
       NAMESPACE = 'kube-system'.freeze
       REPO_NAME = 'appscode'.freeze
       REPO_URL = 'https://charts.appscode.com/stable/'.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',
@@ -26,60 +27,71 @@ module Kuby
 
       OPERATOR_PARAMS.freeze
 
+      REPLICA_SET_MATCH_LABELS = {
+        'release' => OPERATOR_RELEASE_NAME,
+        'app' => 'kubedb'
+      }
+
+      REPLICA_SET_MATCH_LABELS.freeze
+
       def setup
-        Kuby.logger.info('Setting up kubedb')
+        Kuby.logger.info('Setting up KubeDB')
 
-        Kuby.logger.info('Fetching Helm chart')
+        Kuby.logger.info('Fetching KubeDB Helm chart')
         helm_cli.add_repo(REPO_NAME, REPO_URL)
         helm_cli.update_repos
 
-        Kuby.logger.info('Deploying kubedb operator')
+        Kuby.logger.info('Deploying KubeDB operator')
         operator_deployed? ? upgrade_operator : install_operator
 
         wait_for_operator do
-          Kuby.logger.info('Waiting for kubedb operator deployment')
+          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
 
-        Kuby.logger.info('Kubedb setup finished')
+        Kuby.logger.info('KubeDB setup finished')
       end
 
       private
 
       def install_operator
-        helm_cli.install_chart(OPERATOR_CHART_NAME, {
+        helm_cli.install_chart(OPERATOR_CHART_NAME,
           release: OPERATOR_RELEASE_NAME,
           version: Kuby::KubeDB::KUBEDB_VERSION,
           namespace: NAMESPACE,
           params: OPERATOR_PARAMS
-        })
+        )
       end
 
       def upgrade_operator
-        helm_cli.upgrade_chart(OPERATOR_CHART_NAME, {
+        helm_cli.upgrade_chart(OPERATOR_CHART_NAME,
           release: OPERATOR_RELEASE_NAME,
           version: Kuby::KubeDB::KUBEDB_VERSION,
           namespace: NAMESPACE,
           params: OPERATOR_PARAMS
-        })
+        )
       end
 
       def install_catalog
-        helm_cli.install_chart(CATALOG_CHART_NAME, {
+        helm_cli.install_chart(CATALOG_CHART_NAME,
           release: CATALOG_RELEASE_NAME,
           version: Kuby::KubeDB::KUBEDB_VERSION,
           namespace: NAMESPACE
-        })
+        )
       end
 
       def upgrade_catalog
-        helm_cli.upgrade_chart(CATALOG_CHART_NAME, {
+        helm_cli.upgrade_chart(CATALOG_CHART_NAME,
           release: CATALOG_RELEASE_NAME,
           version: Kuby::KubeDB::KUBEDB_VERSION,
           namespace: NAMESPACE
-        })
+        )
       end
 
       def wait_for_operator
@@ -88,15 +100,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
 
@@ -142,20 +174,19 @@ module Kuby
         kubernetes_cli.get_object(
           'Deployment', NAMESPACE, OPERATOR_DEPLOYMENT_NAME
         )
-      rescue ::Kuby::Kubernetes::GetResourceError
+      rescue ::KubernetesCLI::GetResourceError
         nil
       end
 
       def find_operator_rs(depl)
-        match_labels = depl.dig('metadata', 'labels')
-        all_rs_data = kubernetes_cli.get_objects('ReplicaSet', NAMESPACE, match_labels)
+        all_rs_data = kubernetes_cli.get_objects('ReplicaSet', NAMESPACE, REPLICA_SET_MATCH_LABELS)
         current_revision = depl.dig('metadata', 'annotations', 'deployment.kubernetes.io/revision')
 
         all_rs_data.find do |rs|
           rs.dig('metadata', 'ownerReferences').any? { |ref| ref['uid'] == depl.dig('metadata', 'uid') } &&
             rs.dig('metadata', 'annotations', 'deployment.kubernetes.io/revision') == current_revision
         end
-      rescue ::Kuby::Kubernetes::GetResourceError
+      rescue ::KubernetesCLI::GetResourceError
         nil
       end
 
@@ -168,7 +199,7 @@ module Kuby
       end
 
       def helm_cli
-        @helm_cli ||= HelmCLI.new(provider.kubeconfig_path)
+        provider.helm_cli
       end
 
       def kubernetes_cli
@@ -176,7 +207,7 @@ module Kuby
       end
 
       def provider
-        definition.kubernetes.provider
+        environment.kubernetes.provider
       end
     end
   end

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

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

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: kuby-kube-db
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: helm-cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: helm-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -235,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: KubeDB plugin for Kuby.