kuby-kube-db 0.3.0 → 0.6.2

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',
@@ -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
 
@@ -49,37 +54,37 @@ module Kuby
       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 +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
 
@@ -142,7 +167,7 @@ module Kuby
         kubernetes_cli.get_object(
           'Deployment', NAMESPACE, OPERATOR_DEPLOYMENT_NAME
         )
-      rescue ::Kuby::Kubernetes::GetResourceError
+      rescue ::KubernetesCLI::GetResourceError
         nil
       end
 
@@ -155,7 +180,7 @@ module Kuby
           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 +193,7 @@ module Kuby
       end
 
       def helm_cli
-        @helm_cli ||= HelmCLI.new(provider.kubeconfig_path)
+        provider.helm_cli
       end
 
       def kubernetes_cli
@@ -176,7 +201,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.3.0'.freeze
-    KUBEDB_VERSION = 'v0.13.0-rc.4'.freeze
+    VERSION = '0.6.2'.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.3.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-06-06 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.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: kube-dsl
   requirement: !ruby/object:Gem::Requirement
@@ -63,11 +63,9 @@ files:
 - lib/kuby/kube-db/dsl/api/v1/object_meta.rb
 - lib/kuby/kube-db/dsl/api/v1/pod_spec.rb
 - lib/kuby/kube-db/dsl/api/v1/pod_template_spec.rb
-- lib/kuby/kube-db/dsl/api/v1/prometheus_exporter_spec.rb
 - lib/kuby/kube-db/dsl/api/v1/prometheus_spec.rb
 - lib/kuby/kube-db/dsl/api/v1/rest_server_spec.rb
 - lib/kuby/kube-db/dsl/api/v1/s3_spec.rb
-- lib/kuby/kube-db/dsl/api/v1/service_monitor_spec.rb
 - lib/kuby/kube-db/dsl/api/v1/service_port.rb
 - lib/kuby/kube-db/dsl/api/v1/service_spec.rb
 - lib/kuby/kube-db/dsl/api/v1/service_template_spec.rb
@@ -75,6 +73,30 @@ files:
 - lib/kuby/kube-db/dsl/appcatalog.rb
 - lib/kuby/kube-db/dsl/appcatalog/v1alpha1.rb
 - lib/kuby/kube-db/dsl/appcatalog/v1alpha1/app_reference.rb
+- lib/kuby/kube-db/dsl/authorization.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_condition.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_list.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_spec.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/database_access_request_status.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/lease.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_condition.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_list.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_spec.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/mongo_db_role_status.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_condition.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_list.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_spec.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/my_sql_role_status.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/postgres_role.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_condition.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_list.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_spec.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/postgres_role_status.rb
+- lib/kuby/kube-db/dsl/authorization/v1alpha1/role_reference.rb
 - lib/kuby/kube-db/dsl/catalog.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/elasticsearch_version.rb
@@ -111,16 +133,8 @@ files:
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/my_sql_version_init_container.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/my_sql_version_list.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/my_sql_version_pod_security_policy.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/my_sql_version_replication_mode_detector.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/my_sql_version_spec.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/my_sql_version_tools.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_database.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_exporter.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_init_container.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_list.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_pod_security_policy.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_spec.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/postgres_version.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/postgres_version_database.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/postgres_version_exporter.rb
@@ -128,12 +142,6 @@ files:
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/postgres_version_pod_security_policy.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/postgres_version_spec.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/postgres_version_tools.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/proxy_sql_version.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/proxy_sql_version_exporter.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/proxy_sql_version_list.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/proxy_sql_version_pod_security_policy.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/proxy_sql_version_proxysql.rb
-- lib/kuby/kube-db/dsl/catalog/v1alpha1/proxy_sql_version_spec.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/redis_version.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/redis_version_database.rb
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/redis_version_exporter.rb
@@ -142,9 +150,11 @@ files:
 - lib/kuby/kube-db/dsl/catalog/v1alpha1/redis_version_spec.rb
 - lib/kuby/kube-db/dsl/kubedb.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/certificate_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/connection_pool_config.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/databases.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/backup_schedule_spec.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/dormant_database.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/dormant_database_list.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/dormant_database_spec.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/dormant_database_status.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/elasticsearch.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/elasticsearch_cluster_topology.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/elasticsearch_list.rb
@@ -157,10 +167,6 @@ files:
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/etcd_status.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/init_spec.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/leader_election_config.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/maria_db.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/maria_db_list.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/maria_db_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/maria_db_status.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/member_secret.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/memcached.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/memcached_list.rb
@@ -181,25 +187,14 @@ files:
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/my_sql_list.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/my_sql_spec.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/my_sql_status.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/percona_xtra_db.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/percona_xtra_db_list.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/percona_xtra_db_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/percona_xtra_db_status.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/pg_bouncer.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/pg_bouncer_list.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/pg_bouncer_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/pg_bouncer_status.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/origin.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/origin_spec.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/postgres.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/postgres_archiver_spec.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/postgres_list.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/postgres_spec.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/postgres_status.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/postgres_wal_source_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/proxy_sql.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/proxy_sql_backend_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/proxy_sql_list.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/proxy_sql_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/proxy_sql_status.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/recovery_target.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/redis.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/redis_cluster_spec.rb
@@ -207,8 +202,16 @@ files:
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/redis_spec.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/redis_status.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/script_source_spec.rb
-- lib/kuby/kube-db/dsl/kubedb/v1alpha1/tls_config.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/snapshot.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/snapshot_list.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/snapshot_source_spec.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/snapshot_spec.rb
+- lib/kuby/kube-db/dsl/kubedb/v1alpha1/snapshot_status.rb
 - lib/kuby/kube-db/dsl/kubedb/v1alpha1/tls_policy.rb
+- lib/kuby/kube-db/dsl/meta.rb
+- lib/kuby/kube-db/dsl/meta/v1.rb
+- lib/kuby/kube-db/dsl/meta/v1/initializer.rb
+- lib/kuby/kube-db/dsl/meta/v1/initializers.rb
 - lib/kuby/kube-db/dsl/v1.rb
 - lib/kuby/kube-db/dsl/v1/volume_source.rb
 - lib/kuby/kube-db/entrypoint.rb

data/lib/kuby/kube-db/dsl/api/v1/prometheus_exporter_spec.rb

@@ -1,22 +0,0 @@
-module Kuby::KubeDB::DSL::Api::V1
-  class PrometheusExporterSpec < ::KubeDSL::DSLObject
-    value_fields :args, :port
-    array_field(:env) { KubeDSL::DSL::V1::EnvVar.new }
-    object_field(:security_context) { KubeDSL::DSL::V1::SecurityContext.new }
-    object_field(:resources) { KubeDSL::DSL::V1::ResourceRequirements.new }
-
-    def serialize
-      {}.tap do |result|
-        result[:args] = args
-        result[:port] = port
-        result[:env] = envs.map(&:serialize)
-        result[:securityContext] = security_context.serialize
-        result[:resources] = resources.serialize
-      end
-    end
-
-    def kind_sym
-      :prometheus_exporter_spec
-    end
-  end
-end

data/lib/kuby/kube-db/dsl/api/v1/service_monitor_spec.rb

@@ -1,18 +0,0 @@
-module Kuby::KubeDB::DSL::Api::V1
-  class ServiceMonitorSpec < ::KubeDSL::DSLObject
-    value_fields :namespace, :interval
-    key_value_field(:labels, format: :string)
-
-    def serialize
-      {}.tap do |result|
-        result[:namespace] = namespace
-        result[:interval] = interval
-        result[:labels] = labels.serialize
-      end
-    end
-
-    def kind_sym
-      :service_monitor_spec
-    end
-  end
-end

data/lib/kuby/kube-db/dsl/catalog/v1alpha1/my_sql_version_replication_mode_detector.rb

@@ -1,15 +0,0 @@
-module Kuby::KubeDB::DSL::Catalog::V1alpha1
-  class MySQLVersionReplicationModeDetector < ::KubeDSL::DSLObject
-    value_fields :image
-
-    def serialize
-      {}.tap do |result|
-        result[:image] = image
-      end
-    end
-
-    def kind_sym
-      :my_sql_version_replication_mode_detector
-    end
-  end
-end

data/lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version.rb

@@ -1,20 +0,0 @@
-module Kuby::KubeDB::DSL::Catalog::V1alpha1
-  class PerconaXtraDBVersion < ::KubeDSL::DSLObject
-    value_fields :api_version
-    object_field(:spec) { Kuby::KubeDB::DSL::Catalog::V1alpha1::PerconaXtraDBVersionSpec.new }
-    object_field(:metadata) { KubeDSL::DSL::Meta::V1::ObjectMeta.new }
-
-    def serialize
-      {}.tap do |result|
-        result[:kind] = "PerconaXtraDBVersion"
-        result[:apiVersion] = api_version
-        result[:spec] = spec.serialize
-        result[:metadata] = metadata.serialize
-      end
-    end
-
-    def kind_sym
-      :percona_xtra_db_version
-    end
-  end
-end

data/lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_database.rb

@@ -1,15 +0,0 @@
-module Kuby::KubeDB::DSL::Catalog::V1alpha1
-  class PerconaXtraDBVersionDatabase < ::KubeDSL::DSLObject
-    value_fields :image
-
-    def serialize
-      {}.tap do |result|
-        result[:image] = image
-      end
-    end
-
-    def kind_sym
-      :percona_xtra_db_version_database
-    end
-  end
-end

data/lib/kuby/kube-db/dsl/catalog/v1alpha1/percona_xtra_db_version_exporter.rb

@@ -1,15 +0,0 @@
-module Kuby::KubeDB::DSL::Catalog::V1alpha1
-  class PerconaXtraDBVersionExporter < ::KubeDSL::DSLObject
-    value_fields :image
-
-    def serialize
-      {}.tap do |result|
-        result[:image] = image
-      end
-    end
-
-    def kind_sym
-      :percona_xtra_db_version_exporter
-    end
-  end
-end