kubernetes_helper 1.11.2 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c41532791e352e8faf3292df90c6b1d6e62846a28037be8d28cb7d92441104
-  data.tar.gz: e74e693b4b8c741cb0df1da0e6e4e94a28b1ec20cf9a43469dd09bbb67884e91
+  metadata.gz: f82e5c03c90bdac6d509cc112dac0ae783b3114758e259bad14e45a85959e6e4
+  data.tar.gz: c8324c75469a8ac9d7239eb62b740bfc60da6d0baac8c6db9c021edd544f62c9
 SHA512:
-  metadata.gz: b8654828bde9d8de102165c5b034b1d19aa948e5da709b280a96f922f881792756e1a791878cb2ffa3a3a8fd45baa52ab25399f17f89ecb51b4a9df44e38c667
-  data.tar.gz: ff68484362812d0a247f2f42469f731869de61380a60011c2627714e5a94fb585605aa68e9e11fc63ea529e59a64d7fd17ba119ceb0b0c3795dbecd07ce8910f
+  metadata.gz: 636ad611aaf5b8f6b43a4c13643302f9efd33879476feec8c87701a4506220db9c7df3536772b0d24aba087692a856fd7f2b61d757b6e2967ad9507b6ec97e94
+  data.tar.gz: cb5a3c6a14edf82b6577f4bd0d98e21b0d92c2fce74fcf6bafca06466713dd377bcb98ec3d0d9fe087e24e2b6f943e22d31d77393b2ec48e5d95ed41eaf65d8e

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.2'
+  VERSION = '1.12.1'
 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/cd.sh

@@ -41,9 +41,12 @@ ALREADY_DEPLOYED="$(gcloud container images list-tags --format='get(tags)' $IMAG
 if [ -z $ALREADY_DEPLOYED ]
 then
   ## Build and push containers
+  echo "****** image not created yet, building image..."
   docker $DOCKER_BUILD_CMD -t $DEPLOY_NAME .
   docker push $DEPLOY_NAME
 fi
+
+echo "****** tagging image $DEPLOY_NAME as $LATEST_NAME"
 docker tag $DEPLOY_NAME $LATEST_NAME
 docker push $LATEST_NAME
 

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.2
+  version: 1.12.1
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb