kuby-azure 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da523bdedfeffea5c364555a1217b9a5712a371ab67f07574553e68e7a769b1a
-  data.tar.gz: 78a1551643822f38a596bc32525677b5e9d5d21024ddcb0d0f7370a4c14fce6b
+  metadata.gz: 0b314dd23ada59d875f5c1affa60fead32e729488a9ab10b0421094689faadeb
+  data.tar.gz: 6d3ba0f33f82c32da6f7e8bb70cd53a14c9fc4fe6fd8d18129513b3abab273ff
 SHA512:
-  metadata.gz: d75d1f261e418dbf0f2ea8cc0048d4d97b0c57a9226f692e71d2b7b7156e96d878ea6ff22e070d0d380089249fa93fa242a1a56006f8ca0e7a52ac79dda32c49
-  data.tar.gz: b734007a3fe96779d33d296b3f48221ce6b69f92efa808f5cc12485a61846d78ddcbed0deeffcaeeee4792762b7f573259d75bf78fbeaec05d1546838733c51d
+  metadata.gz: 9bb31401305129d8e4e280a1ff45eef067bd2d0a8903be954c60691b9a92a65fb372c0da5578a802a5d1914d9bc09bdd9cdb127fa2f09fbfa94a2ad7fa13aa22
+  data.tar.gz: 386587ddd5741f4537e41391cc7c80536f1ea1b976d887f039f2cc8e17e5a41298d7d22edc040dd057544a99467fa6200628ce34138d62bc77c90dbb953c3787

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.3.3
+* Avoid using `kubernetes_cli` during kubeconfig refresh.
+  - Fixes infinite recursion.
+
+## 0.3.2
+* Refresh kubeconfig before CLI object is constructed.
+
+## 0.3.1
+* Add a unique hash of the configuration options to the kubeconfig path (#1, @pandwoter)
+
+## 0.3.0
+* Accept `environment` instead of `definition` instances.
+
 ## 0.2.0
 * Remove dependency on rails app.
 * Refresh kubeconfig in more places.

data/README.md

@@ -13,30 +13,32 @@ All providers adhere to a specific interface, meaning you can swap out one provi
 Enable the Azure provider like so:
 
 ```ruby
-Kuby.define(:production) do
-  kubernetes do
+Kuby.define('MyApp') do
+  environment(:production) do
+    kubernetes do
 
-    provider :azure do
-      # Visible in the subscription overview.
-      subscription_id 'my-subscription-id'
+      provider :azure do
+        # Visible in the subscription overview.
+        subscription_id 'my-subscription-id'
 
-      # Visible in Azure Active Directory.
-      tenant_id 'my-tenant-id'
+        # Visible in Azure Active Directory.
+        tenant_id 'my-tenant-id'
 
-      # These must be configured in Azure Active Directory -> App
-      # Registrations. It's easiest to generate a client id and
-      # secret for the service principal.
-      client_id 'my-client-id'
-      client_secret 'my-client-secret'
+        # These must be configured in Azure Active Directory -> App
+        # Registrations. It's easiest to generate a client id and
+        # secret for the service principal.
+        client_id 'my-client-id'
+        client_secret 'my-client-secret'
 
-      # Your cluster should have been created inside a resource group.
-      # Put its name here.
-      resource_group_name 'my-resource-group-name'
+        # Your cluster should have been created inside a resource group.
+        # Put its name here.
+        resource_group_name 'my-resource-group-name'
 
-      # The name of your cluster.
-      resource_name 'my-resource-name'
-    end
+        # The name of your cluster.
+        resource_name 'my-resource-name'
+      end
 
+    end
   end
 end
 ```

data/lib/kuby/azure/config.rb

@@ -1,4 +1,5 @@
 require 'kube-dsl'
+require 'digest'
 
 module Kuby
   module Azure
@@ -7,6 +8,15 @@ module Kuby
 
       value_fields :tenant_id, :client_id, :client_secret, :subscription_id
       value_fields :resource_group_name, :resource_name
+
+      def hash_value
+        parts = [
+          tenant_id, client_id, client_secret, subscription_id,
+          resource_group_name, resource_name
+        ]
+
+        Digest::SHA256.hexdigest(parts.join(':'))
+      end
     end
   end
 end

data/lib/kuby/azure/provider.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'azure_mgmt_container_service'
 require 'tmpdir'
+require 'digest'
 
 module Kuby
   module Azure
@@ -14,8 +15,9 @@ module Kuby
       end
 
       def kubeconfig_path
-        @kubeconfig_path ||= File.join(
-          kubeconfig_dir, "#{definition.app_name.downcase}-kubeconfig.yaml"
+        File.join(
+          kubeconfig_dir,
+          "#{environment.app_name.downcase}-#{config.hash_value}-kubeconfig.yaml"
         )
       end
 
@@ -23,22 +25,18 @@ module Kuby
         STORAGE_CLASS_NAME
       end
 
-      def before_setup
-        refresh_kubeconfig
-      end
-
-      def before_deploy(*)
-        refresh_kubeconfig
+      def kubernetes_cli
+        @kubernetes_cli ||= begin
+          refresh_kubeconfig
+          super
+        end
       end
 
       private
 
       def after_initialize
         @config = Config.new
-
-        kubernetes_cli.before_execute do
-          refresh_kubeconfig
-        end
+        @kubeconfig_refreshed = false
       end
 
       def client
@@ -65,15 +63,19 @@ module Kuby
         kubeconfig = cred.kubeconfigs.first.value.pack('C*')
         File.write(kubeconfig_path, kubeconfig)
 
+        @kubeconfig_refreshed = true
+
         Kuby.logger.info('Successfully refreshed kubeconfig!')
       end
 
       def should_refresh_kubeconfig?
+        return false if @kubeconfig_refreshed
         !File.exist?(kubeconfig_path) || !can_communicate_with_cluster?
       end
 
       def can_communicate_with_cluster?
-        cmd = [kubernetes_cli.executable, '--kubeconfig', kubeconfig_path, 'get', 'ns']
+        cli = ::KubernetesCLI.new(kubeconfig_path)
+        cmd = [cli.executable, '--kubeconfig', kubeconfig_path, 'get', 'ns']
         `#{cmd.join(' ')}`
         $?.success?
       end

data/lib/kuby/azure/version.rb

@@ -1,5 +1,5 @@
 module Kuby
   module Azure
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-azure
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kube-dsl
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Azure provider for Kuby.