kubernetes_helper 1.12.5 → 1.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671e4935f2fa146de59fab6b0bedc9a994fb061c106d14ecad194360b4433a7e
-  data.tar.gz: 5deea0563a57c83b31c38870548c43ed8f97400187b83d4166e2879cb83904da
+  metadata.gz: fa7e78cceeb40228bdfb3dea0d9e89e9beb112e484eb61ca8e7302716b69abd4
+  data.tar.gz: 1b6eda67f29f936e66714f08b538ef868b1f3e3c76f67d3e4f2e09098898e5a1
 SHA512:
-  metadata.gz: cea87bbc5e92dbf20c4cabd3f6bfc88e78027bb1b349abaa43b39335e4a3aa4da7a57d4260e6415fdd3934e845282859062943d292ef63807fe48fb678aad6c2
-  data.tar.gz: b767e7a995c1b8c4300e11df0c1df928b6865beffb320810864a504b94e39b27820e7fffc5da0cc2e25a349535f9583bbd07112eb36b023ea84268e181e10892
+  metadata.gz: 2c7816fd3c3cea7dc303f2923b453338f4ad976cf577bea302d75e0b7c84ee0dee98fc58d06b76c9816de0dc14cb31b8ea0aa19ce7e5cc768bb20faf76cbee7e
+  data.tar.gz: ea90240216df3170b2185203cc1d27688950eb83130caee7e339b368501dfeb1c613a480895c17dadb7a3e235b3338cabd80871079b0a5d428b4309e7c3949be

data/README.md

@@ -77,6 +77,7 @@ Below settings are used when configuring the application in the k8s environment
     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.log_folder` (String, default `/app/log`): Logs to be printed from
 - `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
@@ -88,8 +89,8 @@ Below settings are used when configuring the application in the k8s environment
 - `secrets.name` (String): K8s secrets name where env vars will be saved and fetched from. Sample: `my-app-secrets`
 
 - `service.name`: K8s service name. Sample: `my-app-service`
-- `service.port_name`: Http port name to connect between k8s ingress and service. Sample: `http-port`. Note: max 15 characters
-- `service.backend_port_name` (String): Web backend port name to be connected between k8s service and web deployments. Sample: `b-port`. Note: max 15 characters
+- `service.port_name` (String, default `http-port`): Http port name to connect between k8s ingress and service. Sample: `http-port`. Note: max 15 characters
+- `service.backend_port_name` (String, default `b-port`): Web backend port name to be connected between k8s service and web deployments. Sample: `b-port`. Note: max 15 characters
 
 - `ingress.name`: Name of k8s ingress for the app: Sample: `my-app-ingress`
 - `ingress.ip_name` (Optional): Static ip address is not created nor assigned if empty value. Sample: `my-app-static-ip`

data/lib/kubernetes_helper/version.rb

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

data/lib/kubernetes_helper.rb

@@ -23,8 +23,16 @@ module KubernetesHelper
         name: 'gcloud'
       },
       deployment: {
-        log_container: true
-      }
+        log_container: true,
+        log_folder: '/app/log'
+      },
+      service: {
+        port_name: 'http-port',
+        backend_port_name: 'b-port'
+      },
+      secrets: {},
+      continuous_deployment: {},
+      ingress: {}
     }
     deep_merge(def_settings, settings || {})
   end

data/lib/templates/deployment.yml

@@ -48,7 +48,7 @@ documents:
                 <% if deployment.log_container %>
                 - &log_volume
                   name: applog
-                  mountPath: /app/log
+                  mountPath: <%= deployment.log_folder %>
                 <% end %>
 
                 <% if deployment.cloud_secret_name %>
@@ -80,7 +80,7 @@ documents:
             - &logs_container # print to stdout all log files
               name: print-logs
               image: busybox
-              command: [/bin/sh, -c, 'until find /app/log/*.log; do sleep 1; done; tail -n+1 -f /app/log/*.log']
+              command: [/bin/sh, -c, 'until find <%= deployment.log_folder %>/*.log; do sleep 1; done; tail -n+1 -f <%= deployment.log_folder %>/*.log']
               env: []
               volumeMounts:
                 - *log_volume

data/lib/templates/settings.rb

@@ -17,6 +17,12 @@ settings = {
     # job_services: ['sidekiq', 'cron'] # list of linux services needed.
     # custom_volumes: { my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }
   },
+  secrets: {
+    name: "#{app_name}-secrets"
+  },
+  service: {
+    name: app_name,
+  },
   ingress: {
     name: "#{app_name}-ingress",
     ip_name: "#{app_name}-static-ip", # nil if static ip is not necessary
@@ -32,14 +38,6 @@ settings = {
     docker_build_cmd: 'build -f Dockerfile', # using target: 'build --target production -f Dockerfile '
     update_deployment: false # permits to reload secrets and re-generate/update deployment yaml
   },
-  secrets: {
-    name: "#{app_name}-secrets"
-  },
-  service: {
-    name: app_name,
-    port_name: 'http-port', # max 15 characters
-    backend_port_name: 'b-port' # max 15 characters
-  }
 }
 
 KubernetesHelper.settings(settings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: 1.12.5
+  version: 1.12.8
 platform: ruby
 authors:
 - owen2345