k8s-ruby2 0.10.8 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81cc0649baf215e8752b780d291c665e8ba3459d81ce833753f02acfb7d7433d
-  data.tar.gz: '055386dc40656b18b56b8183a5a3349a8acdbe736bdd333e4ec68676c421b800'
+  metadata.gz: 1352b8de0b29904b27cfc252235172e90a67bfee6145e9d1d1a87d208dec367a
+  data.tar.gz: 7ec31822a14ad48427a384e098692c70506355efad0e5e6e02bb3dfcc4569d7b
 SHA512:
-  metadata.gz: 77c3b7fd5108604d254aba24f67c84277a9025627c1a5fe7afd4d4f8ee77e3abe3a0be343f2e83d2e9a1a76854295bef8f1b8fe72b2b6fa7a10290326e7c9f0a
-  data.tar.gz: a506f96d9ec9c60776da5f5a87a3a74b7aa17357a7511a0b9585aff2589f52ec5679539eaac2b1f3f0a575aa7fc57e7eb84c99f14022128c2b264f52010dc20e
+  metadata.gz: 698229faa98d24de265a2fe096e0b2a8ac8753f19148b5cf2448242e205604da434ab9fb5ca243fc690f5677362c21f52c849cef128c7c1b87dc4a1f43cb7c1b
+  data.tar.gz: 8a3e6037f97e1720b1a1125d55d7ae774b4c81b21781a890d2249f6dd118265250cf70016380fd8c1ed28563ff4cb4b6df40ff4914ddbf8f46a419ef618c0dc8

data/.gitignore

@@ -6,8 +6,9 @@
 /pkg/
 /spec/reports/
 /tmp/
-Gemfile.lock
+
 .ruby-version
+.tool-versions
 /.byebug_history
 
 # rspec failure tracking

data/Dockerfile

@@ -1,10 +1,14 @@
-FROM ruby:2.4.3
+ARG BASE_IMAGE=ruby:2.7
+FROM ${BASE_IMAGE}
 
 WORKDIR /app
 
 COPY Gemfile *.gemspec ./
-COPY lib/k8s/client/version.rb ./lib/k8s/client/
+COPY lib/k8s/ruby/version.rb ./lib/k8s/ruby/
+
+RUN gem install bundler:2.3.5
 RUN bundle install
+RUN bundle update --bundler
 
 COPY . .
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    k8s-ruby2 (0.10.8)
+    k8s-ruby2 (2.0.13)
       dry-struct (~> 1.4.0)
       dry-types (~> 1.5.0)
       excon (~> 0.78)
@@ -21,8 +21,8 @@ GEM
     concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
-    diff-lcs (1.4.4)
-    dry-configurable (0.13.0)
+    diff-lcs (1.5.0)
+    dry-configurable (0.14.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
     dry-container (0.9.0)
@@ -44,34 +44,34 @@ GEM
       dry-core (~> 0.5, >= 0.5)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    excon (0.88.0)
+    excon (0.91.0)
     hashdiff (1.0.1)
     ice_nine (0.11.2)
     jsonpath (1.1.0)
       multi_json
     multi_json (1.15.0)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
     recursive-open-struct (1.1.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (1.8.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -81,7 +81,7 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.12.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     unicode-display_width (2.1.0)
@@ -93,8 +93,7 @@ GEM
     yaml-safe_load_stream2 (0.1.1)
 
 PLATFORMS
-  arm64-darwin-20
-  x86_64-darwin-20
+  arm64-darwin-21
 
 DEPENDENCIES
   bundler (>= 1.17, < 3.0)
@@ -106,4 +105,4 @@ DEPENDENCIES
   webmock (~> 3.11.0)
 
 BUNDLED WITH
-   2.2.30
+   2.3.7

data/README.md

@@ -175,7 +175,7 @@ pods = client.api('v1').resource('pods', namespace: 'default').delete_collection
 
 #### Programmatically defined resources
 ```ruby
-service = K8s::Resource.new(
+service = K8s::Resource.new({
   apiVersion: 'v1',
   kind: 'Service',
   metadata: {
@@ -189,7 +189,7 @@ service = K8s::Resource.new(
     ],
     selector: {'app' => 'test'},
   },
-)
+})
 
 logger.info "Create service=#{service.metadata.name} in namespace=#{service.metadata.namespace}"
 

data/docker-compose.yaml

@@ -1,10 +1,27 @@
-rspec:
-  build: .
-  volumes:
-  - .:/app
-  entrypoint: bundle exec rspec
-k8s-ruby:
-  build: .
-  volumes:
-  - .:/app
-  entrypoint: bundle exec bin/k8s-client
+services:
+  rspec-2.6:
+    build:
+      context: .
+      args:
+        BASE_IMAGE: ruby:2.6
+    volumes:
+      - .:/app
+    entrypoint: bundle exec rspec
+
+  rspec-2.7:
+    build:
+      context: .
+      args:
+        BASE_IMAGE: ruby:2.7
+    volumes:
+      - .:/app
+    entrypoint: bundle exec rspec
+
+  rspec-3.0:
+    build:
+      context: .
+      args:
+        BASE_IMAGE: ruby:3.0
+    volumes:
+      - .:/app
+    entrypoint: bundle exec rspec

data/k8s-ruby2.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "k8s/ruby/version"
 

data/lib/k8s/config.rb

@@ -115,7 +115,12 @@ module K8s
     # @param path [String]
     # @return [K8s::Config]
     def self.load_file(path)
-      new(YAML.safe_load(File.read(File.expand_path(path)), [Time, DateTime, Date], [], true))
+      new(YAML.safe_load(
+        File.read(File.expand_path(path)),
+        permitted_classes: [Time, DateTime, Date],
+        permitted_symbols: [],
+        aliases: true
+      ))
     end
 
     # Loads configuration files listed in KUBE_CONFIG environment variable and

data/lib/k8s/resource.rb

@@ -40,17 +40,16 @@ module K8s
     end
 
     # @param hash [Hash]
-    # @param recurse_over_arrays [Boolean]
     # @param options [Hash] see RecursiveOpenStruct#initialize
     def initialize(hash, options = {}, **kwargs)
       options_with_defaults = { recurse_over_arrays: true }.merge(options).merge(kwargs)
       super(hash, options_with_defaults)
     end
 
-    # @param options [Hash] see Hash#to_json
+    # @param args [Array] see Hash#to_json
     # @return [String]
-    def to_json(**options)
-      to_hash.to_json(**options)
+    def to_json(*args, **options)
+      to_hash.to_json(*args, **options)
     end
 
     # @param other [K8s::Resource]

data/lib/k8s/ruby/version.rb

@@ -3,6 +3,6 @@
 module K8s
   class Ruby
     # Updated on releases using semver.
-    VERSION = "0.10.8"
+    VERSION = "2.0.13"
   end
 end

data/lib/k8s/transport.rb

@@ -91,10 +91,13 @@ module K8s
       new(server, **options, **overrides)
     end
 
-    # @param auth_provider [K8s::Config::UserAuthProvider]
+    # @param auth_provider_config [K8s::Config::UserAuthProvider]
     # @return [String]
     def self.token_from_auth_provider_config(auth_provider_config)
+      return auth_provider_config['id-token'] if auth_provider_config['id-token']
+
       auth_data = `#{auth_provider_config['cmd-path']} #{auth_provider_config['cmd-args']}`.strip
+
       if auth_provider_config['token-key']
         json_path = JsonPath.new(auth_provider_config['token-key'][1...-1])
         json_path.first(auth_data)
@@ -133,8 +136,14 @@ module K8s
       port = ENV['KUBERNETES_SERVICE_PORT_HTTPS'].to_s
       raise(K8s::Error::Configuration, "in_cluster_config failed: KUBERNETES_SERVICE_PORT_HTTPS environment not set") if port.empty?
 
+      host_with_ipv6_brackets_if_needed = if host.include? "::"
+        "[#{host}]"
+      else
+        host
+      end
+
       new(
-        "https://#{host}:#{port}",
+        "https://#{host_with_ipv6_brackets_if_needed}:#{port}",
         ssl_verify_peer: options.key?(:ssl_verify_peer) ? options.delete(:ssl_verify_peer) : true,
         ssl_ca_file: options.delete(:ssl_ca_file) || File.join((ENV['TELEPRESENCE_ROOT'] || '/'), 'var/run/secrets/kubernetes.io/serviceaccount/ca.crt'),
         auth_token: options.delete(:auth_token) || File.read(File.join((ENV['TELEPRESENCE_ROOT'] || '/'), 'var/run/secrets/kubernetes.io/serviceaccount/token')),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: k8s-ruby2
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 2.0.13
 platform: ruby
 authors:
 - rdx.net
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-30 00:00:00.000000000 Z
+date: 2022-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Kubernetes client library for Ruby