minfra-cli 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c2cd6c0f9b45301e739a4bd6498b506268d3ea4f668d9c5437d2f39c0e4cc30
-  data.tar.gz: 9d6dbf72959dcb9fa91787ddb2fb54610a3d8b1d6b023f09d5339e939e24e212
+  metadata.gz: ce377c35c375bead26c389cb71f133d00c34943e2501b31f2857faa79fb6db80
+  data.tar.gz: 79f36a7b3687605752d7993cb74f2cc03a959ff50d49e55363c419333533c846
 SHA512:
-  metadata.gz: ca47a07f705b40f20a27372ce57c574db9e0dce1ef35a8c07b94858119bda680fe27201d8767ea482268ea856211e3bd3d8f0d1e58126e6feb4ced103d5da99a
-  data.tar.gz: 5085dce8b8d6cf68fd572dbba57a4587088d49c65a6dcd7669d5cdd4f43f71c15874022775be78e1808a91a25ed4b539d1ac55078e090aa4ecc2e302755ac208
+  metadata.gz: 95da7b04165f9447658c333185d97e7d200d9b19baf00477f8c10012df1b6248099437b57cd0507dbc860cc7912a93ba65ccdd1bd9800207077d382345b47ea9
+  data.tar.gz: 3a69224f2098e83977dbbd111a124e0f1238b055e3326627456f3b17cfdcd3297f0ec535cd029936d2d05efe4e5e5a9285b68907529690b9af3dd17aaa31ff5e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.0
+ * no .tags any more
+# 1.1.0
+ 
 # 1.0.2
  * looking up cluster name by hiera cluster.id
 # 1.0.1

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,16 +5,17 @@ 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 || l!("cluster").id
-        puts "Stack selection: #{@name}, #{@path}, #{@cluster}"
+        @result_path = config.status_path.join('stacks', @cluster, name)
+        puts "Stack selection: #{@name}, #{@config_path}, #{@cluster}, #{@result_path}"
       end
 
       def cluster_name
@@ -26,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?
@@ -37,7 +38,11 @@ module Minfra
       end
 
       def stack_rb_path
+<<<<<<< HEAD
         release_path.join('stack.rb')
+=======
+        config_path.join('stack.rb')
+>>>>>>> 105dc30122db54328cdf1707f5d3d10d4d8792c3
       end
 
       def compose_path(blank: false)
@@ -55,7 +60,7 @@ module Minfra
       end
 
       def release_path
-        @path
+        @result_path
       end
 
 

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

@@ -17,11 +17,11 @@ module Minfra
         info 'Creating tag.'
         debug "Using .tags folder..."
         write_tag_folder_file(message)
-        run_cmd(cmd_add_tag_info("#{@tags_folder}/#{tag_name}"), :system)
-        run_cmd(cmd_create_tag_commit, :system)
+        #run_cmd(cmd_add_tag_info("#{@tags_folder}/#{tag_name}"), :system)
+        #run_cmd(cmd_create_tag_commit, :system)
         run_cmd(cmd_tag_commit(message), :system)
-        info 'Pushing tag to remote.'
-        run_cmd(cmd_push, :system)
+#        info 'Pushing tag to remote.'
+#        run_cmd(cmd_push, :system)
         run_cmd(cmd_push_tag, :system)
       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.2'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

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.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-30 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,6 +156,7 @@ files:
 - Dockerfile
 - Gemfile
 - Gemfile.lock
+- README.md
 - bin/build
 - bin/console
 - bin/container_exec