kuby-linode 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b02f5b7ceb4756e4c177d3e2cbddb01340e4483c445be7450022da2d0abe75
-  data.tar.gz: d203e31153215b224a1fd7eb1b46edcabdf515da1074d8aa01c6451623fbadff
+  metadata.gz: 3ef921c80cb878286577fc739b1f7251ca2f65e902ed235b9686e20f8efb9477
+  data.tar.gz: 3e4699bb0037b9698650c090ad0065d6bdd76717e03616803c1670de09b7bda4
 SHA512:
-  metadata.gz: 6fe8b16ab0a4d5d84f6782f7683df929c4a9655ce25bcd4295c1c84fb1ed230090a805b399898400405bb5ce1916a436137c880f559c7294d04c956f41ae6561
-  data.tar.gz: d4e02a93bbc31e140922afe500d35645f3ee7fc427265f88ef59f9c8ae22189348bdcb8e1220962ed680ab72d709b449551196094ed12cfe4d83245e444bc627
+  metadata.gz: 9a7bc044c46d8af896bae55f0a9085d2a300a085bb6c0e7f960416e8cef5d7e23e1fb67985d2b2ba0e415a5ffc1441a2199149f82e9850384d54a694fddadc83
+  data.tar.gz: 50cfd0daf6a9c20c641898fcd78dc0e227832eebb57b52e9aa691211ee04087b63e5004a91db77fb2804922c4622659800a39379092c5853bd8e607a9307c5e2

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.4.0
+* Remove Faraday dependency.
+
+## 0.3.2
+* Add a unique hash of the configuration options to the kubeconfig path.
+* Update README with new environment syntax.
+* Use `linode-block-storage-retain` storage class to prevent losing block storage volumes when PVCs are deleted.
+
+## 0.3.1
+* Avoid `instance_eval`ing a `nil` block during configuration.
+
+## 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,14 +13,16 @@ All providers adhere to a specific interface, meaning you can swap out one provi
 Enable the Linode provider like so:
 
 ```ruby
-Kuby.define(:production) do
-  kubernetes do
+Kuby.define('MyApp') do
+  environment(:production) do
+    kubernetes do
 
-    provider :linode do
-      access_token 'my-linode-access-token'
-      cluster_id 'my-cluster-id'
-    end
+      provider :linode do
+        access_token 'my-linode-access-token'
+        cluster_id 'my-cluster-id'
+      end
 
+    end
   end
 end
 ```

data/kuby-linode.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
 
   s.platform = Gem::Platform::RUBY
 
-  s.add_dependency 'faraday', '~> 0.17'
   s.add_dependency 'kube-dsl', '~> 0.1'
 
   s.require_path = 'lib'

data/lib/kuby/linode/client.rb

@@ -1,5 +1,6 @@
 require 'base64'
-require 'faraday'
+require 'net/http'
+require 'uri'
 
 module Kuby
   module Linode
@@ -24,31 +25,40 @@ module Kuby
       end
     end
 
+    class BearerAuth
+      attr_reader :access_token
+
+      def initialize(access_token:)
+        @access_token = access_token
+      end
+
+      def make_get(path)
+        Net::HTTP::Get.new(path).tap do |request|
+          request['Authorization'] = "Bearer #{access_token}"
+        end
+      end
+    end
+
     class Client
       API_URL = 'https://api.linode.com'.freeze
       KUBECONFIG_PATH = '/v4/lke/clusters/%{cluster_id}/kubeconfig'.freeze
 
       def self.create(access_token:)
-        options = {
-          url: API_URL,
-          headers: {
-            Accept: 'application/json',
-            Authorization: "Bearer #{access_token}"
-          }
-        }
-
-        new(
-          Faraday.new(options) do |faraday|
-            faraday.request(:retry, max: 3)
-            faraday.adapter(:net_http)
-          end
-        )
+        uri = URI(API_URL)
+
+        connection = Net::HTTP.new(uri.host, uri.port).tap do |http|
+          http.use_ssl = true if uri.scheme == 'https'
+        end
+
+        auth = BearerAuth.new(access_token: access_token)
+        new(connection, auth)
       end
 
-      attr_reader :connection
+      attr_reader :connection, :auth
 
-      def initialize(connection)
+      def initialize(connection, auth)
         @connection = connection
+        @auth = auth
       end
 
       def kubeconfig(cluster_id)
@@ -58,32 +68,25 @@ module Kuby
 
       private
 
-      def get(url, params = {})
-        act(:get, url, params)
-      end
-
-      def get_json(url, params = {})
-        response = get(url, params)
+      def get_json(path)
+        request = auth.make_get(path)
+        request['Accept'] = 'application/json'
+        response = connection.request(request)
+        potentially_raise_error!(response)
         JSON.parse(response.body)
       end
 
-      def act(verb, *args)
-        connection.send(verb, *args).tap do |response|
-          potentially_raise_error!(response)
-        end
-      end
-
       def potentially_raise_error!(response)
-        case response.status
+        case response.code.to_i
           when 401
-            raise UnauthorizedError, "401 Unauthorized: #{response.env.url}"
+            raise UnauthorizedError, "401 Unauthorized: #{response.message}"
           when 404
-            raise NotFoundError, "404 Not Found: #{response.env.url}"
+            raise NotFoundError, "404 Not Found: #{response.message}"
           else
             if failure_response?(response)
               raise ApiError.new(
-                "HTTP #{response.status}: #{response.env.url}, body: #{response.body}",
-                response.status
+                "HTTP #{response.code}: #{response.message}, body: #{response.body}",
+                response.code
               )
             end
         end
@@ -91,7 +94,7 @@ module Kuby
 
       def failure_response?(response)
         data = JSON.parse(response.body) rescue {}
-        (response.status / 100) != 2 || data['message'] == 'failure'
+        (response.code.to_i / 100) != 2 || data['message'] == 'failure'
       end
     end
   end

data/lib/kuby/linode/config.rb

@@ -1,4 +1,5 @@
 require 'kube-dsl'
+require 'digest'
 
 module Kuby
   module Linode
@@ -6,6 +7,12 @@ module Kuby
       extend ::KubeDSL::ValueFields
 
       value_fields :access_token, :cluster_id
+
+      def hash_value
+        Digest::SHA256.hexdigest(
+          [access_token, cluster_id].join(':')
+        )
+      end
     end
   end
 end

data/lib/kuby/linode/provider.rb

@@ -5,17 +5,18 @@ module Kuby
   module Linode
     class Provider < Kuby::Kubernetes::Provider
       KUBECONFIG_EXPIRATION = 7 * 24 * 60 * 60  # 7 days
-      STORAGE_CLASS_NAME = 'linode-block-storage'.freeze
+      STORAGE_CLASS_NAME = 'linode-block-storage-retain'.freeze
 
       attr_reader :config
 
       def configure(&block)
-        config.instance_eval(&block)
+        config.instance_eval(&block) if block
       end
 
       def kubeconfig_path
         @kubeconfig_path ||= File.join(
-          kubeconfig_dir, "#{definition.app_name.downcase}-kubeconfig.yaml"
+          kubeconfig_dir,
+          "#{environment.app_name.downcase}-#{config.hash_value}-kubeconfig.yaml"
         )
       end
 
@@ -31,14 +32,18 @@ module Kuby
         STORAGE_CLASS_NAME
       end
 
+      def kubernetes_cli
+        @kubernetes_cli ||= ::KubernetesCLI.new(kubeconfig_path).tap do |cli|
+          cli.before_execute do
+            refresh_kubeconfig
+          end
+        end
+      end
+
       private
 
       def after_initialize
         @config = Config.new
-
-        kubernetes_cli.before_execute do
-          refresh_kubeconfig
-        end
       end
 
       def client

data/lib/kuby/linode/version.rb

@@ -1,5 +1,5 @@
 module Kuby
   module Linode
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kuby-linode
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: kube-dsl
   requirement: !ruby/object:Gem::Requirement
@@ -74,7 +60,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: Linode provider for Kuby.