minfra-cli 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cab66f511ab6227678a724abe92791129b2a7fa892ce9c89f930b9c414cbc334
-  data.tar.gz: 231d318901b435af0a09cbdc75cde85af803641a4592fe0f0262982dd91c1d41
+  metadata.gz: 5c2cd6c0f9b45301e739a4bd6498b506268d3ea4f668d9c5437d2f39c0e4cc30
+  data.tar.gz: 9d6dbf72959dcb9fa91787ddb2fb54610a3d8b1d6b023f09d5339e939e24e212
 SHA512:
-  metadata.gz: 19c9601223257a4a38727f337a9ac279e04663175ecb8342a4dc0b96d229cf4f3aefe06bb4301d089fb640f21b774d6fb0c67cdf1cef951d3983534a80592d3c
-  data.tar.gz: 40271ce6dda6d181362478070f1a38d7962e4ef8246dc13c8c10e84e3d99ebc352a0e9082f6cfab023ebb47208658cf2e2e94adfc6b853a6e74f4e1d8534d18f
+  metadata.gz: ca47a07f705b40f20a27372ce57c574db9e0dce1ef35a8c07b94858119bda680fe27201d8767ea482268ea856211e3bd3d8f0d1e58126e6feb4ced103d5da99a
+  data.tar.gz: 5085dce8b8d6cf68fd572dbba57a4587088d49c65a6dcd7669d5cdd4f43f71c15874022775be78e1808a91a25ed4b539d1ac55078e090aa4ecc2e302755ac208

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+# 1.0.2
+ * looking up cluster name by hiera cluster.id
 # 1.0.1
  * adding l! method
 # 1.0.0

data/Gemfile

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in ccs-infra.gemspec
+gemspec
+
+gem "rake", "~> 12.0"
+gem "rspec", "~> 3.0"
+gem "timecop", "~> 0.9.5"

data/Gemfile.lock

@@ -0,0 +1,87 @@
+PATH
+  remote: .
+  specs:
+    minfra-cli (1.0.1)
+      activesupport (~> 6.1)
+      erubis (~> 2.7)
+      hashie (~> 3.5)
+      hiera (= 3.9.0)
+      hiera-eyaml (= 3.3.0)
+      hiera-eyaml-gpg (= 0.7.4)
+      rest-client (~> 2.0)
+      table_print (= 1.5.6)
+      thor (~> 1.0, >= 1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.7)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    erubis (2.7.0)
+    hashie (3.6.0)
+    hiera (3.9.0)
+    hiera-eyaml (3.3.0)
+      highline
+      optimist
+    hiera-eyaml-gpg (0.7.4)
+      hiera-eyaml (>= 1.3.8)
+    highline (2.0.3)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    minitest (5.16.3)
+    netrc (0.11.0)
+    optimist (3.0.1)
+    rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    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.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    table_print (1.5.6)
+    thor (1.2.1)
+    timecop (0.9.5)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    zeitwerk (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minfra-cli!
+  rake (~> 12.0)
+  rspec (~> 3.0)
+  timecop (~> 0.9.5)
+
+BUNDLED WITH
+   2.1.4

data/lib/minfra/cli/commands/stack/kube_stack_template.rb

@@ -13,19 +13,12 @@ module Minfra
         @config     = config
         @env        = config.orch_env
         @deployment = deployment.freeze
-        @cluster    = cluster.freeze
+        @cluster    = cluster.freeze || l!("cluster").id
         puts "Stack selection: #{@name}, #{@path}, #{@cluster}"
       end
 
       def cluster_name
-        return @cluster_name if defined?(@cluster_name)
-        @cluster_name = @cluster
-        @cluster_name ||= "kind-#{@config.name}" if @config.dev?
-        if cluster_path.exist? && (@cluster_name.nil? || @cluster_name.empty?)
-            @cluster_name = YAML.load(File.read(cluster_path))[env.to_s]
-        end
-        @cluster_name ||= env
-        @cluster_name
+        @cluster
       end
 
       def mixin_env
@@ -47,10 +40,6 @@ module Minfra
         release_path.join('stack.rb')
       end
 
-      def cluster_path
-        release_path.join("cluster.yaml")
-      end
-
       def compose_path(blank: false)
         if blank
           release_path.join("compose.yaml")
@@ -65,15 +54,6 @@ module Minfra
         @errors.join(";\n")
       end
 
-      # we use a special file to flag the this stack is releasable to an environment
-      def releasable?
-        switch_path.exist?
-      end
-
-      def switch_path
-        release_path.join("#{@env}_#{rancher_stack_name}.sh")
-      end
-
       def release_path
         @path
       end

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -75,7 +75,6 @@ module Minfra
       node_scope=hiera.lookup("env", {},  scope, nil, :deeper)
       scope=scope.merge(node_scope)
       cache={}
-
       Kernel.define_method(:l) do |value,default=nil|
        return cache[value] if cache.has_key?(value)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Peter Schrammel
@@ -154,6 +154,8 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Dockerfile
+- Gemfile
+- Gemfile.lock
 - bin/build
 - bin/console
 - bin/container_exec