minfra-cli 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cab66f511ab6227678a724abe92791129b2a7fa892ce9c89f930b9c414cbc334
-  data.tar.gz: 231d318901b435af0a09cbdc75cde85af803641a4592fe0f0262982dd91c1d41
+  metadata.gz: ad8c40bad784c7d620305dd1f0b352e96c51d21a985017cbf98550b110d8ee6d
+  data.tar.gz: 7f5895eeaf923585c2e7072d09b3bac513228662c09761c89af81ec442a374d2
 SHA512:
-  metadata.gz: 19c9601223257a4a38727f337a9ac279e04663175ecb8342a4dc0b96d229cf4f3aefe06bb4301d089fb640f21b774d6fb0c67cdf1cef951d3983534a80592d3c
-  data.tar.gz: 40271ce6dda6d181362478070f1a38d7962e4ef8246dc13c8c10e84e3d99ebc352a0e9082f6cfab023ebb47208658cf2e2e94adfc6b853a6e74f4e1d8534d18f
+  metadata.gz: 599880ad0ff8161584e13abdd479371c793cc551ef6f788d556bd5ae5f4e742399539a150ca896f84781a9796ac91e7c0134172d53e952106cb9067c7cd0d91c
+  data.tar.gz: 1cf840dac8f60258804e20ffeee65b3c41e6c6248ff9a08b187000ad145bd498ca540b0be090739e12b135f8a68a5b443f662be6d684e087316dc667a9772351

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.1.0
+ * adding state path so stacks/ is now read only and all generated states are in state/
+ * logger's output always goes to STDERR
+
+# 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/README.md

@@ -0,0 +1,36 @@
+# minfra-cli
+
+Is a KIND (k8s in docker) based development environment.
+
+
+
+## Expected hiera data
+
+ * l("cluster").id: the k8s name of the cluster
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Orchparty
+
+It's a fork of the original orchparty. TBD: see
+
+The base is an application
+
+an application can have 
+ * services
+ * apply
+ * environment
+ * variables
+ * configurations
+ * secrets

data/lib/minfra/cli/commands/kube.rb

@@ -86,18 +86,21 @@ module Minfra
         cluster = stack.cluster_name
 
         method = options["install"] ? "install" : "upgrade"
-        File.open(stack.compose_path(blank: true),"w") do |f|
+
+        stack.release_path.mkpath
+        
+        File.open(stack.compose_path,"w") do |f|
           Orchparty::App.new(cluster_name: cluster, 
                         application_name: stack.name, 
                         force_variable_definition: false, 
                         file_name: stack.stack_rb_path.to_s,
+                        status_dir: stack.release_path,
                         options: options
                         ).
                         print( method: method, out_io: f)
         end
         #run_cmd(generate_cmd, :bash)
         bash_cmd = ["cd #{stack.release_path}"]
-        bash_cmd << "cp #{stack.compose_path(blank: true)} #{stack.compose_path}"
         run_cmd(bash_cmd, :bash)
 
 
@@ -132,6 +135,7 @@ module Minfra
                         application_name: stack.name, 
                         force_variable_definition: false, 
                         file_name: stack.stack_rb_path.to_s,
+                        status_dir: stack.release_path,
                         options: options
                         )
           orch.send(method)

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

@@ -5,27 +5,21 @@ module Minfra
       class KubeStackTemplate
       include ::Minfra::Cli::Logging
 
-      attr_reader :name, :env, :deployment
+      attr_reader :name, :env, :deployment, :config_path
       def initialize(name, config, deployment: '', cluster:)
         @name       = name
-        @path       = config.stacks_path.join(name)
+        @config_path = config.stacks_path.join(name)
         @errors     = []
         @config     = config
         @env        = config.orch_env
         @deployment = deployment.freeze
-        @cluster    = cluster.freeze
-        puts "Stack selection: #{@name}, #{@path}, #{@cluster}"
+        @cluster    = cluster.freeze || l!("cluster").id
+        @result_path = config.status_path.join('stacks', @cluster, name)
+        puts "Stack selection: #{@name}, #{@config_path}, #{@cluster}, #{@result_path}"
       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
@@ -33,8 +27,8 @@ module Minfra
       end
 
       def valid?
-        unless @path.exist?
-          @errors << "stack path #{@path} doesn't exist"
+        unless @config_path.exist?
+          @errors << "stack path #{@config_path} doesn't exist"
         end
 
         unless stack_rb_path.exist?
@@ -44,11 +38,7 @@ module Minfra
       end
 
       def stack_rb_path
-        release_path.join('stack.rb')
-      end
-
-      def cluster_path
-        release_path.join("cluster.yaml")
+        config_path.join('stack.rb')
       end
 
       def compose_path(blank: false)
@@ -65,17 +55,8 @@ 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
+        @result_path
       end
 
 

data/lib/minfra/cli/config.rb

@@ -16,6 +16,7 @@ module Minfra
       attr_reader :base_path
       attr_reader :config_path
       attr_reader :stacks_path
+      attr_reader :status_path
       attr_reader :me_path
       attr_reader :kube_path
       attr_reader :kube_config_path
@@ -41,6 +42,7 @@ module Minfra
         @project_config_path=@base_path.join("config","project.json")
         @config_path =  @me_path.join('config.json')
         @stacks_path = @base_path.join('stacks')
+        @status_path = @base_path.join('state')
         @kube_path=@me_path.join('kube')
         @kube_config_path=@kube_path.join('config')
         @kind_config_path=@me_path.join("kind.yaml.erb")

data/lib/minfra/cli/logging.rb

@@ -11,15 +11,15 @@ module Minfra
       end
 
       def info(str)
-        STDOUT.puts str
+        STDERR.puts str
       end
 
       def debug(str)
-        STDOUT.puts "Debug: #{str}"
+        STDERR.puts "Debug: #{str}"
       end
 
       def deprecated(comment)
-        puts "DEPRECATED: #{comment}"
+        STDERR.puts "DEPRECATED: #{comment}"
       end
     end
   end

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.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)
 

data/lib/orchparty/kubernetes_application.rb

@@ -16,11 +16,12 @@ module Orchparty
       attr_accessor :app_config
       attr_accessor :options
 
-      def initialize(cluster_name: , namespace:, file_path: , app_config:, out_io: STDOUT)
+      def initialize(cluster_name: , namespace:, file_path: , app_config:, out_io: STDOUT, app: )
         self.cluster_name = cluster_name
         self.namespace = namespace
         self.dir_path = file_path
         self.app_config = app_config
+        @app = app
         @out_io = out_io
         self.options=options
       end
@@ -158,14 +159,13 @@ module Orchparty
 
       def build_chart(chart)
         params = chart._services.map {|s| app_config.services[s.to_sym] }.map{|s| [s.name, s]}.to_h
-        Dir.mktmpdir("#{chart.name}-") do |dir|
-          run(templates_path: File.expand_path(chart.template, self.dir_path), params: params, output_chart_path: dir, chart: chart)
-          yield dir
-        end
+        dir = @app.status_dir.join('helm')
+        dir.mkpath
+        run(templates_path: File.expand_path(chart.template, self.dir_path), params: params, output_chart_path: dir, chart: chart)
+        yield dir
       end
 
       def run(templates_path:, params:, output_chart_path:, chart: )
-        system("mkdir -p #{output_chart_path}")
         system("mkdir -p #{File.join(output_chart_path, 'templates')}")
 
         system("cp #{File.join(templates_path, 'values.yaml')} #{File.join(output_chart_path, 'values.yaml')}")
@@ -256,12 +256,14 @@ class KubernetesApplication
   attr_accessor :file_path
   attr_accessor :namespace
   attr_accessor :app_config
+  attr_reader :status_dir
 
-  def initialize(app_config: [], namespace:, cluster_name:, file_name:, out_io: STDOUT)
+  def initialize(app_config: [], namespace:, cluster_name:, file_name:, status_dir:, out_io: STDOUT)
     self.file_path = Pathname.new(file_name).parent.expand_path
     self.cluster_name = cluster_name
     self.namespace = namespace
     self.app_config = app_config
+    @status_dir = status_dir
     @out_io= out_io
   end
 
@@ -295,7 +297,7 @@ class KubernetesApplication
     services.each do |name|
       service = app_config[:services][name]
       puts "Service: #{name}(#{service._type}) #{method}"
-      "::Orchparty::Services::#{service._type.classify}".constantize.new(cluster_name: cluster_name, namespace: namespace, file_path: file_path, app_config: app_config, out_io: @out_io).send(method, service)
+      "::Orchparty::Services::#{service._type.classify}".constantize.new(cluster_name: cluster_name, namespace: namespace, file_path: file_path, app_config: app_config, out_io: @out_io, app: self).send(method, service)
     end
   end
 end

data/lib/orchparty.rb

@@ -23,12 +23,14 @@ module Orchparty
   class App
     attr_reader :options
 
-    def initialize(cluster_name:, application_name:, force_variable_definition:, file_name:, options: {})
+    def initialize(cluster_name:, application_name:, force_variable_definition:, file_name:, status_dir:, options: {})
       @cluster_name = cluster_name
       @application_name = application_name
       @force_variable_definiton = force_variable_definition
       @file_name = file_name
+      @status_dir = status_dir
       @options = options
+      
       Orchparty.options=options
       
       load_plugins
@@ -55,7 +57,14 @@ module Orchparty
     def app(out_io: STDOUT)
       parsed = Orchparty::Kubernetes::DSLParser.new(@file_name).parse
       app_config = Transformations.transform_kubernetes(parsed, force_variable_definition: @force_variable_definition).applications[@application_name]
-      KubernetesApplication.new(app_config: app_config, namespace: @application_name, cluster_name: @cluster_name, file_name: @file_name, out_io: out_io)
+      KubernetesApplication.new(
+        app_config: app_config, 
+        namespace: @application_name, 
+        cluster_name: @cluster_name, 
+        file_name: @file_name,
+        status_dir: @status_dir,
+        out_io: out_io
+      )
     end
     
     def generate(plugin_name, options, plugin_options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -154,6 +154,9 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Dockerfile
+- Gemfile
+- Gemfile.lock
+- README.md
 - bin/build
 - bin/console
 - bin/container_exec