minfra-cli 1.12.1 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca90567af36553b84c7a69020e85970c56591d65f7546d1c22c1969cc9bd58f3
-  data.tar.gz: 451949094ac8fe4a3bc502b10ad1f8924f2cb5688da1297594061ab4c4e4780d
+  metadata.gz: 013e2aad3df9fffb13eaceeac4ccc3306ac4dfedb9ef7f0019251ee4238e9dbf
+  data.tar.gz: 266a3cbfbcbc27eda6411806a20c1f3d5547d4b02fda404531861eb538f1be2b
 SHA512:
-  metadata.gz: 6007ef02b33c582bb9bd002cb4b22adda6dd4e5ec32cf7646beb9597ef03181b8944a463fe5db943c84d19c6ed50c8b324a5bb383cfa975b0f4301e1ffb214d5
-  data.tar.gz: 1908c4e6f95565dc3ebdf2bf371808021166997691c0fcb3514a89b2d47cf379d551b1f5f1934032cfe08afcc180f6f4d75b39d694c584d036f46a5f86aa8f05
+  metadata.gz: ab2a2990bec284c339aaee8b49998cbf93c5cc53179a70ac6ddc6c6d557eb30b3b5b594877d744875bbeb200b90533630e61d60a84b016dab044e128b74aa6b0
+  data.tar.gz: b2e7767759e9c2eb7391974a46d1c1bec649f5247f580a7f7aef3b3bbc98e451d1ef882bdae0fc52fbfa12ad2d572a3d8daefb0a7a05f774909bf1aab1e2f129

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.13.0
+ * secrets can be rendered with apply (currently hardcoded)
+ * moved most output to debug level 
 # 1.12.1
  * replaced all relevant system calls with new runners (fixed apply and
    generic_secrets)

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    minfra-cli (1.7.0)
-      activesupport (~> 6.1)
+    minfra-cli (1.12.0)
+      activesupport (= 7.0.7.2)
       erubis (~> 2.7)
       hashie (~> 3.5)
       hiera (= 3.9.0)
@@ -15,16 +15,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.7.2)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.5.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20231109)
     erubis (2.7.0)
     hashie (3.6.0)
     hiera (3.9.0)
@@ -37,42 +35,38 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.17.0)
+    mime-types-data (3.2023.1205)
+    minitest (5.20.0)
     netrc (0.11.0)
-    optimist (3.0.1)
+    optimist (3.1.0)
     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)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
     table_print (1.5.6)
-    thor (1.2.1)
-    timecop (0.9.5)
+    thor (1.3.0)
+    timecop (0.9.8)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

data/README.md

@@ -7,7 +7,7 @@ Is a KIND (k8s in docker) based development environment.
 
 ## Expected hiera data
 
- * l("cluster").id: the k8s name of the cluster
+ * l("cluster.id"): the k8s name of the cluster
  
 
 

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.12.1'.freeze
+    VERSION = '1.13.0'.freeze
   end
 end

data/lib/orchparty/dsl_parser_kubernetes.rb

@@ -378,12 +378,39 @@ module Orchparty
         self
       end
 
-      def secrets(name, &block)
+      # secrets can be aprt of the helm chart or we write them to
+      # a file and later apply it
+      # apiVersion: v1
+      # kind: Secret
+      # metadata:
+      #  name: dotfile-secret
+      # data:
+      #  key: base64_encoded_value
+
+      def secrets(name, deploy: :helm, &block)
+        case deploy
+        when :helm
         result =  ServiceBuilder.build(name, "chart-secret", block)
         @application.services[name] = result
         @application._service_order << name
         @node._services << name
         self
+        when :apply
+          result = ServiceBuilder.build(name, "apply", block)
+          file = Tempfile.create(name)
+          result.tmp_file=file.path
+          file.puts "apiVersion: v1\nkind: Secret\nmetadata:\n  name: #{name}\ntype: Opaque\ndata:"
+          result._.each do |key, value|
+            file.puts "  #{key}: #{Base64.strict_encode64(value.respond_to?(:call) ? value.call : value)}"
+          end
+          file.close
+          @application.services[name] = result
+          @application._service_order << name
+        when :none
+          
+        else
+          raise "unknown secret type: #{type}, known tpyes: [helm, apply]"
+        end
       end
       
     end

data/lib/orchparty/kubernetes_application.rb

@@ -15,24 +15,24 @@ module Orchparty
     class Context
       include ::Minfra::Cli::Logging
 
-      attr_accessor :cluster_name, :namespace, :dir_path, :app_config, :options
+      attr_accessor :cluster_name, :namespace, :dir_path, :app_config, :options, :service
 
-      def initialize(cluster_name:, namespace:, file_path:, app_config:, app:, out_io: $stdout)
+      def initialize(cluster_name:, namespace:, file_path:, app_config:, app:, service:, out_io: $stdout)
         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.service = service # ugly naming, should be 'context'?
         self.options = options
       end
 
       def template(file_path, helm, flag: '-f ', fix_file_path: nil)
         return '' unless file_path
 
-        puts "Rendering: #{file_path}"
-        file_path = File.join(dir_path, file_path)
-
+        debug "Rendering: #{file_path}"
+        file_path = File.join(dir_path, file_path) unless file_path.start_with?('/')
         if file_path.end_with?('.erb')
           helm.application = OpenStruct.new(cluster_name: cluster_name, namespace: namespace)
           template = Erubis::Eruby.new(File.read(file_path))
@@ -46,124 +46,125 @@ module Orchparty
         "#{flag}#{fix_file_path || file_path}"
       end
 
-      def print_install(helm)
+      def print_install
         @out_io.puts '---'
-        @out_io.puts install_cmd(helm, value_path(helm)).cmd
-        @out_io.puts upgrade_cmd(helm, value_path(helm)).cmd
+        @out_io.puts install_cmd(value_path).cmd
+        @out_io.puts upgrade_cmd(value_path).cmd
         @out_io.puts '---'
-        @out_io.puts File.read(template(value_path(helm), helm, flag: '')) if value_path(helm)
+        @out_io.puts File.read(template(value_path, service, flag: '')) if value_path
+        cleanup
       end
 
       # On 05.02.2021 we have decided that it would be best to print both commands.
       # This way it would be possible to debug both upgrade and install and also people would not see git diffs all the time.
-      def print_upgrade(helm)
-        print_install(helm)
+      def print_upgrade
+        print_install
       end
 
-      def upgrade(helm)
-        @out_io.puts upgrade_cmd(helm).run.stdout
+      def upgrade
+        @out_io.puts upgrade_cmd.run.stdout
+        cleanup if respond_to?(:cleanup)
       end
 
-      def install(helm)
-        @out_io.puts install_cmd(helm).run.stdout
+      def install
+        @out_io.puts install_cmd.run.stdout
+        cleanup if respond_to?(:cleanup)
       end
     end
 
     class Helm < Context
-      def value_path(helm)
-        helm[:values]
+      def value_path
+        service[:values]
       end
 
-      def upgrade_cmd(helm, fix_file_path = nil)
-        Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(
-          value_path(helm), helm, fix_file_path: fix_file_path
+      def upgrade_cmd(fix_file_path = nil)
+        Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} --version #{service.version} #{service.name} #{service.chart} #{template(
+          value_path, service, fix_file_path: fix_file_path
         )}")
       end
 
-      def install_cmd(helm, fix_file_path = nil)
-        Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(
-          value_path(helm), helm, fix_file_path: fix_file_path
+      def install_cmd(fix_file_path = nil)
+        Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} --version #{service.version} #{service.name} #{service.chart} #{template(
+          value_path, service, fix_file_path: fix_file_path
         )}")
       end
     end
 
     class Apply < Context
-      def value_path(apply)
-        apply[:name]
+      def value_path
+        service[:tmp_file] || service[:name]
       end
 
-      def upgrade_cmd(apply, fix_file_path = nil)
-        Minfra::Cli::KubeCtlRunner.new("apply --namespace #{namespace} --context #{cluster_name} #{template(
-          value_path(apply), apply, fix_file_path: fix_file_path
-        )}")
+      def upgrade_cmd(fix_file_path = nil)
+        Minfra::Cli::KubeCtlRunner.new("apply --namespace #{namespace} --context #{cluster_name} #{template(value_path,
+                                                                                                            service, fix_file_path: fix_file_path)}")
       end
 
-      def install_cmd(apply, fix_file_path = nil)
-        Minfra::Cli::KubeCtlRunner.new("apply --namespace #{namespace} --context #{cluster_name} #{template(
-          value_path(apply), apply, fix_file_path: fix_file_path
-        )}")
+      def install_cmd(fix_file_path = nil)
+        Minfra::Cli::KubeCtlRunner.new("apply --namespace #{namespace} --context #{cluster_name} #{template(value_path,
+                                                                                                            service, fix_file_path: fix_file_path)}")
       end
-    end
 
-    class SecretGeneric < Context
-      def value_path(secret)
-        secret[:from_file]
+      def cleanup
+        File.unlink(service[:tmp_file]) if service[:tmp_file]
       end
+    end
 
-      def upgrade_cmd(secret, fix_file_path = nil)
-        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{secret[:name]}  #{template(
-          value_path(secret), secret, flag: '--from-file=', fix_file_path: fix_file_path
-        )} | #{apply_cmd(cluster_name).cmd}")
+    class SecretGeneric < Context
+      def value_path
+        service[:from_file]
       end
 
-      def install_cmd(secret, fix_file_path = nil)
-        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{secret[:name]}  #{template(
-          value_path(secret), secret, flag: '--from-file=', fix_file_path: fix_file_path
-        )} | #{apply_cmd(cluster_name).cmd}")
+      def upgrade_cmd(fix_file_path = nil)
+        "kubectl --namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{service[:name]}  #{template(
+          value_path, service, flag: '--from-file=', fix_file_path: fix_file_path
+        )} | kubectl --context #{cluster_name} apply -f -"
       end
 
-      def apply_cmd(cluster_name)
-        Minfra::Cli::KubeCtlRunner.new("--context #{cluster_name} apply -f -")
+      def install_cmd(fix_file_path = nil)
+        "kubectl --namespace #{namespace} --context #{cluster_name} create secret generic --dry-run -o yaml #{service[:name]}  #{template(
+          value_path, service, flag: '--from-file=', fix_file_path: fix_file_path
+        )} | kubectl --context #{cluster_name} apply -f -"
       end
     end
 
     class Label < Context
-      def print_install(label)
+      def print_install
         @out_io.puts '---'
-        @out_io.puts install_cmd(label)
+        @out_io.puts install_cmd
       end
 
-      def print_upgrade(label)
+      def print_upgrade
         @out_io.puts '---'
-        @out_io.puts upgrade_cmd(label)
+        @out_io.puts upgrade_cmd
       end
 
-      def upgrade_cmd(label)
-        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} label --overwrite #{label[:resource]} #{label[:name]} #{label['value']}")
+      def upgrade_cmd
+        "kubectl --namespace #{namespace} --context #{cluster_name} label --overwrite #{service[:resource]} #{service[:name]} #{service['value']}"
       end
 
-      def install_cmd(label)
-        Minfra::Cli::KubeCtlRunner.new("--namespace #{namespace} --context #{cluster_name} label --overwrite #{label[:resource]} #{label[:name]} #{label['value']}")
+      def install_cmd
+        "kubectl --namespace #{namespace} --context #{cluster_name} label --overwrite #{service[:resource]} #{service[:name]} #{service['value']}"
       end
     end
 
     class Wait < Context
-      def print_install(wait)
+      def print_install
         @out_io.puts '---'
-        @out_io.puts wait.cmd
+        @out_io.puts service.cmd
       end
 
-      def print_upgrade(wait)
+      def print_upgrade
         @out_io.puts '---'
-        @out_io.puts wait.cmd
+        @out_io.puts service.cmd
       end
 
-      def upgrade(wait)
-        eval(wait.cmd)
+      def upgrade
+        eval(service.cmd)
       end
 
-      def install(wait)
-        eval(wait.cmd)
+      def install
+        eval(service.cmd)
       end
     end
 
@@ -176,49 +177,48 @@ module Orchparty
         end
       end
 
-      def print_install(chart)
-        build_chart(chart) do |chart_path|
+      def print_install
+        build_chart do |chart_path|
           cmd = "helm template --namespace #{namespace} --debug --kube-context #{cluster_name} --output-dir #{chart_path.join(
             '..', 'helm_expanded'
-          )}   #{chart.name} #{chart_path}"
+          )}   #{service.name} #{chart_path}"
           @out_io.puts `$cmd`
           if system("#{cmd} > /dev/null")
 
-            info('helm template check: OK')
+            debug('Helm: template check: OK')
           else
-            error('helm template check: FAIL')
+            error('Helm: template check: FAIL')
           end
         end
       end
 
-      def print_upgrade(chart)
-        print_install(chart)
+      def print_upgrade
+        print_install
       end
 
-      def install(chart)
-        info("Install: #{chart.name}")
-        build_chart(chart) do |chart_path|
-          res = Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
+      def install
+        debug("Install: #{service.name}")
+        build_chart do |chart_path|
+          res = Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{service.name} #{chart_path}").run
           @out_io.puts res.stdout
         end
       end
 
-      def upgrade(chart)
-        info("Upgrade: #{chart}")
-        build_chart(chart) do |chart_path|
-          res = Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
+      def upgrade
+        debug("Upgrade: #{service.name}: #{service._services.join(', ')}")
+        build_chart do |chart_path|
+          res = Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} #{service.name} #{chart_path}").run
           @out_io.puts res.stdout
         end
       end
 
       private
 
-      def build_chart(chart)
+      def build_chart
         dir = @app.status_dir.join('helm') # duplication
-
-        params = chart._services.map { |s| app_config.services[s.to_sym] }.map { |s| [s.name, s] }.to_h
-        run(templates_path: File.expand_path(chart.template, dir_path), params: params, output_chart_path: dir,
-            chart: chart)
+        params = service._services.map { |s| app_config.services[s.to_sym] }.map { |s| [s.name, s] }.to_h
+        run(templates_path: File.expand_path(service.template, dir_path), params: params, output_chart_path: dir,
+            chart: service)
         yield dir
       end
 
@@ -253,7 +253,7 @@ module Orchparty
         params._used_vars = {} # here we'll collect all used vars
 
         Dir[File.join(templates_path, kind, '*.erb')].each do |template_path|
-          info("Rendering Template: #{template_path}")
+          debug("Rendering Template: #{template_path}")
           template_name = File.basename(template_path, '.erb')
           output_path = File.join(output_chart_path, 'templates', "#{app_name}-#{template_name}")
 
@@ -318,7 +318,7 @@ class KubernetesApplication
       chart_name: namespace
     )
 
-    info("generating base helm structure from: #{output_chart_path} from #{templates_path}")
+    debug("Minfra: generating base helm structure from: #{output_chart_path} from #{templates_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')}")
@@ -344,6 +344,8 @@ class KubernetesApplication
       current_service._services.each do |n|
         services.delete n.to_s
       end
+      #      else
+      #        puts "unkown service: #{name}: #{current_service._type}"
     end
     services
   end
@@ -351,18 +353,19 @@ class KubernetesApplication
   def each_service(method)
     prepare
     services = combine_charts(app_config)
+
     services.each do |name|
       service = app_config[:services][name]
-      info "Service: #{name}(#{service._type}) #{method}"
+      debug("Generating Service: #{name}(#{service._type}) #{method}")
       deployable_class = "::Orchparty::Services::#{service._type.classify}".constantize
       deployable = deployable_class.new(cluster_name: cluster_name,
                                         namespace: namespace,
                                         file_path: file_path,
                                         app_config: app_config,
                                         out_io: @out_io,
-                                        app: self)
-
-      deployable.send(method, service)
+                                        app: self,
+                                        service: service)
+      deployable.send(method)
     end
   end
 end

data/minfra-cli.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "table_print", "1.5.6"
   spec.add_runtime_dependency "rest-client", "~>2.0"
   spec.add_runtime_dependency "hashie", "~>3.5"
-  spec.add_runtime_dependency "activesupport", ">= 6.1"
+  spec.add_runtime_dependency "activesupport", "= 7.0.7.2"
   spec.add_runtime_dependency "erubis", "~> 2.7"
   spec.add_runtime_dependency "hiera", "3.9.0"
   spec.add_runtime_dependency "hiera-eyaml", "3.3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.13.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -76,16 +76,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 7.0.7.2
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement