biosphere 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b933e04081d1108ed1b590179d5d619c15d132f2
-  data.tar.gz: 438ca2745302cae2516d3ae23b14c16b870140de
+  metadata.gz: af41c8485d5ec0811a8bc7cbbab11204a2bf6063
+  data.tar.gz: c2978b2f6b0365cefcfeaee24ac8e22eb257df4f
 SHA512:
-  metadata.gz: 822377222d2d70e70b85424284bfdb5f00ba9e7e699778298473c91c20fbf834e384a8ed4cbae94909ab98b128869e96bb368b8a49d6bbbb103992657c24d6eb
-  data.tar.gz: ee4ace64c82f8a9eb645253d7a9f8a368dfdd5ea80ed33d2f43b8f6178b1609c2d0977df1985deddfdcc90636122466b94b3ecd0d5a15100ce49a27aa3ef2eb7
+  metadata.gz: eac28688a1713bb4868c218594d40f6ed4668429dd6fcdd58a7def99c9d02b89003376591d4113f2847c790c68f542c80022d77ed86b84050f8221f06f11bef9
+  data.tar.gz: 8af9ff67b5a1c4e64224d1011aa37d5202ec0bf6909fbbd38408b67f494d3ef3e6e11c42549eed5197fe0b2c3e64409d79b367c2cd3c9025e15bb73130ac5949

data/bin/biosphere

@@ -117,6 +117,20 @@ if options.src
         state.load()
     end
 
+    unless state.node[:deployments][""].nil?
+        answer = ""
+        while answer.empty? || (answer != "y" && answer != "n")
+            puts "\e[31mDeployment with an empty name, do you want to clean these out now? [y/n]\e[0m"
+            answer = STDIN.gets.chomp
+        end
+
+        if answer == "n"
+          puts "Remember to clean these out later, this state won't work with Kubernetes"
+        elsif answer == "y"
+          state.node[:deployments].delete("")
+          puts "\e[32mRemoved deployment with empty name\e[0m"
+        end
+    end
 end
 
 if ARGV[0] == "build" && options.src

data/lib/biosphere/deployment.rb

@@ -7,29 +7,31 @@ class Biosphere
 
         attr_reader :export, :name, :_settings, :feature_manifests, :target_groups, :resources
         attr_accessor :state, :node
-        def initialize(*args)
 
+        def initialize(parent, name, settings={})
             @parent = nil
             @name = ""
-            if args[0].kind_of?(::Biosphere::Deployment) || args[0].kind_of?(::Biosphere::Suite)
-                @parent = args.shift
+            if parent.kind_of?(::Biosphere::Deployment) || parent.kind_of?(::Biosphere::Suite)
+                @parent = parent
+            else
+                raise ArgumentError, "Deployment takes a parent Biosphere::Deployment or Biosphere::Suite as it's first parameter"
             end
-            if args[0].kind_of?(String)
-                @name = args.shift
+
+            if name.kind_of?(String) && name.length > 0
+                @name = name
+            else
+                raise ArgumentError, "Deployment takes the deployment name as the first parameter, or as the second parameter if no parent is defined. Name can't be empty."
             end
 
-            settings = {}
             @_settings = {}
-            if args[0].kind_of?(Hash)
-                settings = args.shift
+            if settings.kind_of?(Hash)
+                @_settings = settings
+            elsif settings.kind_of?(::Biosphere::Settings)
                 @_settings = settings
-            elsif args[0].kind_of?(::Biosphere::Settings)
-                @_settings = args.shift
                 settings = @_settings.settings
                 @feature_manifests = @_settings.feature_manifests
             end
 
-
             @export = {
                 "provider" => {},
                 "resource" => {},
@@ -41,10 +43,14 @@ class Biosphere
 
             if @parent.is_a?(::Biosphere::Suite)
                 @parent.register(self)
+                @target_groups = {}
+
             elsif @parent
                 @node = @parent.node
                 @state = @parent.state
                 @export = @parent.export
+                @target_groups = @parent.target_groups
+
                 @parent.register(self)
                 
             else
@@ -56,7 +62,6 @@ class Biosphere
             @actions = {}
             @deployments = []
             @outputs = []
-            @target_groups = {}
 
             if @feature_manifests
                 node[:feature_manifests] = @feature_manifests

data/lib/biosphere/kube.rb

@@ -31,8 +31,11 @@ class Biosphere
                 @clients = []
 
                 @clients << ::Kubeclient::Client.new("#{hostname}/api" , "v1", ssl_options: ssl_options)
+                @clients << ::Kubeclient::Client.new("#{hostname}/apis/apps/" , "v1beta1", ssl_options: ssl_options)
                 @clients << ::Kubeclient::Client.new("#{hostname}/apis/extensions/" , "v1beta1", ssl_options: ssl_options)
                 @clients << ::Kubeclient::Client.new("#{hostname}/apis/batch/" , "v2alpha1", ssl_options: ssl_options)
+                @clients << ::Kubeclient::Client.new("#{hostname}/apis/storage.k8s.io/" , "v1", ssl_options: ssl_options)
+                @clients << ::Kubeclient::Client.new("#{hostname}/apis/autoscaling/" , "v1", ssl_options: ssl_options)
 
                 @clients.each { |c| c.discover }
             end
@@ -51,7 +54,7 @@ class Biosphere
             def get_client(resource)
                 kind = resource[:kind].underscore_case
                 @clients.each do |c|
-                    if c.instance_variable_get("@entities")[kind]
+                    if c.instance_variable_get("@api_group") + c.instance_variable_get("@api_version") == resource[:apiVersion]
                         return c
                     end
                 end
@@ -68,7 +71,6 @@ class Biosphere
                 end
 
                 ns_prefix = client.build_namespace_prefix(resource[:metadata][:namespace])
-                ns_prefix = ns_prefix.empty? ? "namespaces/default/" : ns_prefix
                 ret =  client.rest_client[ns_prefix + resource_name].post(resource.to_h.to_json, { 'Content-Type' => 'application/json' }.merge(client.instance_variable_get("@headers")))
                 return {
                     action: :post,
@@ -131,6 +133,12 @@ class Biosphere
                         response = post(resource)
                         puts "Created resource #{response[:resource]}"
                         responses << response
+                    rescue RestClient::NotFound => e
+                        pp e
+                        pp JSON.parse(e.response.body)
+                        puts "404 when applying resources might mean one of the following:"
+                        puts "\t * You're trying to apply a non-namespaced manifest."
+                        puts "\t   Confirm if your manifests metadata should contain a namespace field or not"
                     rescue RestClient::UnprocessableEntity => e
                         pp e
                         pp JSON.parse(e.response.body)

data/lib/biosphere/version.rb

@@ -1,3 +1,3 @@
 class Biosphere
-  Version = "0.2.4"
+  Version = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biosphere
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement