kubernetes_helper 1.11.3 → 1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235b38e0301bf3d021a192dc336183f89bd3ca214d5c5464b701d4ed03e1faef
-  data.tar.gz: 28ffb4e42d000427b08643c14f24b626d2ee78ace071219bddaf64b35b7b88af
+  metadata.gz: 604789c04d8c343b001119322a2f211f456f901fb8254ba7be2d460727b02523
+  data.tar.gz: c8de634961d39b7525311bc762257a5eb93a7e75f6aac38213b0389ff8af3187
 SHA512:
-  metadata.gz: f8556cd967823100b097347f1a02e2e8681ab16e319c44faf5baa959accb3ca52c08339c1eb1ca04f61c712f63d8e8b76e51e21c5caa1da78e8f79c82c541d8e
-  data.tar.gz: bdbf65ea0309743fb11567d30b2be2bea66382932553a253860762aef5637e04781e07fc78119735d1d9ea30d2e0854d2c58478cc75627b4f100e2710e6973e2
+  metadata.gz: 2dd5e15b7bdf468a7dabd64079060efea3d9e0858817cc2da7e3b37fa2537a207ba0188165e05a8c7fa935025ec3e4e34e9c73bc2f3b1234997e9d4c309bf83b
+  data.tar.gz: 99eb1af9d2ba8bf5fab45341248fa1d467c8bd27ca814b30d149eeebdd068b0d975e882ee50d03eac3ab584f02bc286ad2f48ff3329ba753ffe8bc4070f96203

data/README.md

@@ -74,6 +74,8 @@ Below settings are used when configuring the application in the k8s environment
 - `deployment.custom_volumes` (Hash<name: path>, Optional): Custom volumes to be mounted. 
     Sample volume: `{ my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }`    
     Sample secret: `{ pubsub_secret: { kind: 'secret', mount_path: '/secrets/pubsub', settings: { secretName: 'my_secret_name' } } }`
+- `deployment.log_container` (Boolean, default true): Permits to auto include logs container to print all logs from logs/*.log to stdout (required for papertrail using fluentd)
+- `deployment.app_port` (Integer, default 3000): Application port number
 
 - `deployment.job_name` (String, optional): Job deployment name (Note: Underscores are not accepted). Sample: `my-app-job`. Note: This deployment is created only if this value is present
 - `deployment.job_command` (String, optional): Bash command to be used for job container. Sample: `bundle exec sidekiq`

data/lib/kubernetes_helper/core.rb

@@ -22,7 +22,7 @@ module KubernetesHelper
 
     # @param _env_name (String)
     def initialize(_env_name)
-      @config_values = KubernetesHelper.default_settings.merge(KubernetesHelper.load_settings)
+      @config_values = KubernetesHelper.load_settings
     end
 
     def parse_yml_file(file_path, output_path)

data/lib/kubernetes_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KubernetesHelper
-  VERSION = '1.11.3'
+  VERSION = '1.12'
 end

data/lib/kubernetes_helper.rb

@@ -17,15 +17,21 @@ module KubernetesHelper
   def self.load_settings
     config_file = File.join(settings_path, 'settings.rb')
     load config_file
-    settings
-  end
 
-  def self.default_settings
-    {
+    def_settings = {
       cloud: {
         name: 'gcloud'
+      },
+      deployment: {
+        log_container: true
       }
     }
+    deep_merge(def_settings, settings || {})
+  end
+
+  def self.deep_merge(hash1, hash2)
+    merger = proc { |_key, v1, v2| v1.kind_of?(Hash) && v2.kind_of?(Hash) ? v1.merge(v2, &merger) : v2 }
+    hash1.merge(hash2, &merger)
   end
 
   def self.settings_path(file_name = nil, use_template: false)

data/lib/templates/_volumes.yml

@@ -4,8 +4,10 @@
                 secretName: '<%=deployment.cloud_secret_name%>'
             <% end %>
 
+            <% if deployment.log_container %>
             - name: applog
               emptyDir: {}
+            <% end %>
 
             # Custom volumes
             <% (deployment.custom_volumes || {}).each do |name, vol| %>

data/lib/templates/deployment.yml

@@ -29,7 +29,7 @@ documents:
               static_env: true
               import_secrets: ['secrets.yml', '<%=secrets.name%>']
               ports:
-                - containerPort: &port 3000
+                - containerPort: &port <% deployment.app_port || 3000 %>
                   name: '<%=service.backend_port_name%>'
 
               <% if deployment.liveness_path %>
@@ -45,9 +45,11 @@ documents:
               <%= include_template "_container_extra_settings.yml", { pod: 'web' } %>
 
               volumeMounts:
+                <% if deployment.log_container %>
                 - &log_volume
                   name: applog
                   mountPath: /app/log
+                <% end %>
 
                 <% if deployment.cloud_secret_name %>
                 - &cloud_credentials_volume
@@ -74,6 +76,7 @@ documents:
               <%= include_template "_container_extra_settings.yml", { pod: 'cloudsql' } %>
             <% end %>
 
+            <% if deployment.log_container %>
             - &logs_container # print to stdout all log files
               name: print-logs
               image: busybox
@@ -82,6 +85,7 @@ documents:
               volumeMounts:
                 - *log_volume
               <%= include_template "_container_extra_settings.yml", { pod: 'logs' } %>
+            <% end %>
 
             <%= include_template "_custom_containers.yml", { pod: 'web' } %>
 
@@ -125,7 +129,9 @@ documents:
             - *cloudsql_container
             <% end %>
 
+            <% if deployment.log_container %>
             - <<: *logs_container
+            <% end %>
 
             <%= include_template "_custom_containers.yml", { pod: 'job' } %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: '1.12'
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb