beaker-gke 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4867a7f5a9b76a9a07fad205175c626ad5ffc25a186fdade9d08ebf82eeb87de
-  data.tar.gz: 6d51919cb4ae4984fa182d734520af144d50232d302a45bc988ca0aa43a8fcaa
+SHA1:
+  metadata.gz: 009e87947781520d425d4ba4e3578cd563a86839
+  data.tar.gz: 2754f9512a7dba47bb2330b12d4a3b215fdadd91
 SHA512:
-  metadata.gz: 71b29c3e55c85fb5bb3910dcf0ce6d8051225ea50044063075e625b2883a252e57baf5414ec0f8dbb1ba307169b96d49781af677394be6f3004f0400a1bee1a6
-  data.tar.gz: ab01abfd573b934508440a8d9e01a77b6946ccc75f05bbfff3436346cff24dc419ac857ddd15da2da12bbcbe8b5577ebc85ec1a3510969ab7ddca3b71d2ef772
+  metadata.gz: b8088bc44df805f9cf03895b178d761869f7dbe7d79e7f216d8f66dfd2fe9041687405a6698cb273d49a421d09b0292f4288af703dae8192608a8fb4e6dd4380
+  data.tar.gz: ff708f8ef2966f8254c054fe4449f7fc1461d6ab487e41cbcd2eef5bf345b580a413447ef39abe1c973e5cd2a0f8528b291d1438586e2d0bf5cc436af894a008

data/.rubcop.yaml

@@ -0,0 +1,14 @@
+---
+require:
+  - rubocop-rspec
+  - rubocop-performance
+AllCops:
+  TargetRubyVersion: 2.4
+Documentation:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: 20
+Style/Documentation:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120

data/beaker-gke.gemspec

@@ -1,43 +1,25 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+
 require 'beaker-gke/version'
 
 Gem::Specification.new do |s|
-  s.name        = "beaker-gke"
+  s.name        = 'beaker-gke'
   s.version     = BeakerGke::VERSION
   s.authors     = ["Night's Watch"]
-  s.email       = ["team-nw@puppet.com"]
-  s.homepage    = "https://github.com/puppetlabs/beaker-gke"
-  s.summary     = %q{Beaker hypervisor for GKE!}
-  s.description = %q{For use for the Beaker acceptance testing tool}
-  s.license     = 'Apache2'
+  s.email       = ['team-nw@puppet.com']
+  s.homepage    = 'https://github.com/puppetlabs/beaker-gke'
+  s.summary     = 'Beaker hypervisor for GKE!'
+  s.description = 'Add GKE support to Beaker acceptance testing tool'
+  s.license     = 'Apache-2.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  # Testing dependencies
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rspec-its'
-  # pin fakefs for Ruby < 2.3
-  if RUBY_VERSION < "2.3"
-    s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14'
-  else
-    s.add_development_dependency 'fakefs', '~> 0.6'
-  end
-  s.add_development_dependency 'rake', '~> 10.1'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'pry', '~> 0.10'
-
-  # Documentation dependencies
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'markdown'
-  s.add_development_dependency 'thin'
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |file| File.basename(file) }
+  s.require_paths = ['lib']
 
   # Run time dependencies
+  s.add_runtime_dependency 'googleauth', '~> 0.9'
   s.add_runtime_dependency 'kubeclient', '~> 4.4.0'
-  s.add_runtime_dependency 'jsonpath'
-  s.add_runtime_dependency 'googleauth'
-
-end
+end

data/bin/beaker-gke

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'rubygems' unless defined?(Gem)
 require 'beaker-gke'

data/config/pod.yaml

@@ -1,23 +1,38 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "%{pod_name}"
-  namespace: gke-puppetagent-ci
-  labels:
-    app: "%{pod_name}"
-spec:
-  hostname: "%{pod_name}"
-  containers:
-    - image: gcr.io/puppetagent-ci/centos-7:v5
-      name: "centos-7"
-  dnsPolicy: "None"
-  dnsConfig:
+---
+:apiVersion: v1
+:kind: Pod
+:metadata:
+  :name: "%{pod_name}"
+  :namespace: gke-puppetagent-ci
+  :labels:
+    :app: "%{pod_name}"
+    :project: puppet-agent-ci
+:spec:
+  :hostname: "%{pod_name}"
+  :containers:
+    - :image: <%= ENV.fetch("CONTAINER_IMAGE") { "gcr.io/puppetagent-ci/centos-7-master:v4" } %>
+      :name: "centos-7-master"
+      :securityContext:
+        :capabilities:
+          :add:
+            - NET_ADMIN
+  :dnsPolicy: "None"
+  :dnsConfig:
     nameservers:
       - 10.240.0.10
       - 10.240.1.10
-    searches:
+    :searches:
       - gke-puppetagent-ci.puppet.net
-  hostAliases:
-  - ip: "169.254.169.254"
-    hostnames:
-    - "metadata.google.internal"
+  :hostAliases:
+    - :ip: "169.254.169.254"
+      :hostnames:
+        - "metadata.google.internal"
+  :affinity:
+    :podAntiAffinity:
+      :preferredDuringSchedulingIgnoredDuringExecution:
+      - :weight: 100
+        :podAffinityTerm:
+          :labelSelector:
+            :matchLabels:
+              :project: puppet-agent-ci
+          :topologyKey: kubernetes.io/hostname

data/config/service.yaml

@@ -1,11 +1,12 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: "%{pod_name}"
-  namespace: gke-puppetagent-ci
-  labels:
-    app: "%{pod_name}"
-spec:
-  selector:
-    app: "%{pod_name}"
-  clusterIP: "None"
+---
+:apiVersion: v1
+:kind: Service
+:metadata:
+  :name: "%{pod_name}"
+  :namespace: gke-puppetagent-ci
+  :labels:
+    :app: "%{pod_name}"
+:spec:
+  :selector:
+    :app: "%{pod_name}"
+  :clusterIP: "None"

data/lib/beaker-gke.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
 ROOT_DIR = Pathname.new(File.expand_path('..', __dir__)) unless defined?(ROOT_DIR)

data/lib/beaker-gke/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BeakerGke
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/beaker/hypervisor/gke.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 require 'kubeclient'
-require 'jsonpath'
-require 'beaker'
 require 'beaker-gke'
 require 'googleauth'
+require 'erb'
 
 module Beaker
   class Gke < Beaker::Hypervisor
-    SERVICE_NAMESPACE = 'gke-puppetagent-ci'.freeze
-    PROXY_IP = '10.236.0.3'.freeze
+    SERVICE_NAMESPACE = 'gke-puppetagent-ci'
+    PROXY_IP = '10.236.0.3'
     PROXY_PORT = 8899
     MAX_RETRIES = 5
     # OS environment variable must be set to continue
@@ -18,12 +19,16 @@ module Beaker
       begin
         ENV.fetch('KUBECONFIG')
         ENV.fetch('GOOGLE_APPLICATION_CREDENTIALS')
-      rescue
-        raise ArgumentError, 'OS environment variable KUBECONFIG and GOOGLE_APPLICATION_CREDENTIALS must be set'
+      rescue KeyError
+        raise(
+          ArgumentError,
+          'OS environment variable KUBECONFIG and GOOGLE_APPLICATION_CREDENTIALS must be set'
+        )
       end
-        @hosts = hosts
-        @options = options
-        @client = client
+      @hosts = hosts
+      @options = options
+      @client = client
+      @logger = options[:logger]
     end
 
     def provision
@@ -32,39 +37,43 @@ module Beaker
         create_pod(hostname)
         create_srv(hostname)
         retries = 0
+
         begin
           pod = get_pod(hostname)
-          raise StandardError if pod.status.podIP.nil?
+          raise StandardError unless pod.status.podIP
         rescue StandardError => e
-          if retries <= MAX_RETRIES
-            retries += 1
-          puts 'Retrying , could not get podIP'
-          sleep(2 ** retries)
+          raise "Timeout: #{e.message}" unless retries <= MAX_RETRIES
+
+          @logger.info("Retrying , could not get podIP for #{hostname}")
+
+          retries += 1
+          sleep(2**retries)
           retry
-          else
-            raise "Timeout: #{e.message}"
-            end
         end
+
         host[:vmhostname] = "#{hostname}.gke-puppetagent-ci.puppet.net"
         host[:hostname] = hostname
         host[:ip] = pod.status.podIP
+        host[:gke_container] = true
       end
       nil
     end
 
     def cleanup
       @hosts.each do |host|
+        @logger.info("Deleting POD with ID: #{host[:hostname]}")
+
         delete_pod(host[:hostname])
         delete_service(host[:hostname])
       end
     end
 
-    def connection_preference(host)
-      [:ip, :vmhostname, :hostname]
+    def connection_preference(_host)
+      %i[ip vmhostname hostname]
     end
 
     def create_pod(name)
-      pod_config=read_symbols('pod.yaml',{pod_name:name} )
+      pod_config = read_symbols('pod.yaml', pod_name: name)
       @client.create_pod(pod_config)
     end
 
@@ -73,24 +82,22 @@ module Beaker
     end
 
     def create_srv(name)
-      service_config=read_symbols('service.yaml',{pod_name:name} )
+      service_config = read_symbols('service.yaml', pod_name: name)
       @client.create_service(service_config)
     end
 
     def delete_pod(pod_name)
-      @client.delete_pod(pod_name, SERVICE_NAMESPACE, delete_options: { 'force': 1, 'grace-period': 0  } )
+      @client.delete_pod(
+        pod_name,
+        SERVICE_NAMESPACE,
+        delete_options: { 'force': 1, '--grace-period': 0 }
+      )
     end
 
     def delete_service(srv_name)
-      begin
-       if srv_name.instance_of?(String)
-         client.delete_service(srv_name, SERVICE_NAMESPACE)
-       else
-         raise ArgumentError, 'Wrong argument type - #{srv_name.class}'
-       end
-     end
+      @client.delete_service(srv_name, SERVICE_NAMESPACE)
     rescue Kubeclient::ResourceNotFoundError => e
-      puts "Service #{srv_name} could not be deleted #{e.to_s}"
+      @logger.info("Service #{srv_name} could not be deleted #{e}")
     end
 
     private
@@ -100,21 +107,20 @@ module Beaker
       context = config.context
       proxy_uri = URI::HTTP.build(host: PROXY_IP, port: PROXY_PORT)
       Kubeclient::Client.new(
-          context.api_endpoint, 'v1',
-          http_proxy_uri: proxy_uri,
-          ssl_options: context.ssl_options,
-          auth_options: context.auth_options
+        context.api_endpoint, 'v1',
+        http_proxy_uri: proxy_uri,
+        ssl_options: context.ssl_options,
+        auth_options: context.auth_options
       )
     end
 
     def read_file(file_name)
-      path = File.join(ROOT_DIR, 'config', file_name)
-      File.read(path)
+      File.read(File.join(ROOT_DIR, 'config', file_name))
     end
 
     def read_symbols(file, substitution = {})
-      data = read_file(file)
-      Psych.load(data %substitution , symbolize_names: true)
+      data = ERB.new(read_file(file)).result
+      Psych.load(data % substitution, symbolize_names: true)
     end
   end
 end

metadata

@@ -1,141 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: beaker-gke
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Night's Watch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.1'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
+        version: '0.9'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: markdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: kubeclient
   requirement: !ruby/object:Gem::Requirement
@@ -150,35 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.0
-- !ruby/object:Gem::Dependency
-  name: jsonpath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: googleauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: For use for the Beaker acceptance testing tool
+description: Add GKE support to Beaker acceptance testing tool
 email:
 - team-nw@puppet.com
 executables:
@@ -186,6 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubcop.yaml"
 - CODEOWNERS
 - Gemfile
 - LICENSE
@@ -200,7 +61,7 @@ files:
 - lib/beaker/hypervisor/gke.rb
 homepage: https://github.com/puppetlabs/beaker-gke
 licenses:
-- Apache2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -217,7 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Beaker hypervisor for GKE!