kubernetes_helper 1.1 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bed0753481fee12fa822da715a6836b55fb561deaca02e8763e59d05b3edc6b
-  data.tar.gz: 28d56d40d55c667e479ee26126fc7014415afec77ee884eb58daac2c4e60809e
+  metadata.gz: 0cb2f960ab9f32029afa3d4a925fc83214ab418e599a6a5390dfc5bf829949b4
+  data.tar.gz: d64116a047e22ba97848ae36d7cbedc40af6ed726f5d5b22614aafa11b416677
 SHA512:
-  metadata.gz: d4d8b5606a4d3d9649de1add4341dcea076e2892e2d908d24f1cce5c14fb206b9bd779da7546544634b0341806163f3949f98c24bdd9a0a16dbf4149fa597117
-  data.tar.gz: 331f4263fb0ad4fd29bda318f079e36e0954c58bd8a50dc4507e49d0e88043afcfe03a8bad22390d5776042bd07837d4232c5b7879a06074870369274866537d
+  metadata.gz: 96a1085608ca8a96c40126075272665ecdf477de54775cc77caee257996c1ba9e070e6b6a0f9da598359394286233ae3e2c4cd68f19e6cb11f6e3f03ad5ecd49
+  data.tar.gz: e32e8e082431c44d18ce92a33094db31c696d3f2b7810f21bbf8497592daf8378a205725bfe7269ca8773987fdf5e7a0976ce2e1f27c9b6cb16d763ed4c29b4b

data/lib/kubernetes_helper/core.rb

@@ -22,7 +22,7 @@ module KubernetesHelper
 
     # @param _env_name (String)
     def initialize(_env_name)
-      @config_values = KubernetesHelper.load_settings
+      @config_values = KubernetesHelper.default_settings.merge(KubernetesHelper.load_settings)
     end
 
     def parse_yml_file(file_path, output_path)
@@ -115,6 +115,8 @@ module KubernetesHelper
     def parse_documents(yml_data)
       documents = []
       Array(yml_data).each do |document|
+        next unless document
+
         document['documents'] ? documents.push(*document['documents']) : documents.push(document)
       end
       documents

data/lib/kubernetes_helper/version.rb

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

data/lib/kubernetes_helper.rb

@@ -20,6 +20,14 @@ module KubernetesHelper
     settings
   end
 
+  def self.default_settings
+    {
+      cloud: {
+        name: 'gcloud'
+      }
+    }
+  end
+
   def self.settings_path(file_name = nil, use_template: false)
     path = File.join(Dir.pwd, FOLDER_NAME)
     if file_name

data/lib/templates/certificate.yml

@@ -0,0 +1,7 @@
+apiVersion: networking.gke.io/v1beta1
+kind: ManagedCertificate
+metadata:
+  name: '<%=ingress.certificate_name%>'
+spec:
+  domains: # does not support for willcard domains
+    - '<%=ingress.domain_name%>'

data/lib/templates/deployment.yml

@@ -54,6 +54,11 @@ documents:
                   readOnly: true
                 <% end %>
 
+                <% (deployment.custom_volumes || {}).each do |name, vol| %>
+                - name: <%= name %>
+                  mountPath: <%= vol[:mount_path] %>
+                <% end %>
+
             <% if deployment.cloud_secret_name %>
             - &cloudsql_container
               image: gcr.io/cloudsql-docker/gce-proxy:1.09 # Cloud sql proxy
@@ -61,6 +66,7 @@ documents:
               command: ["/cloud_sql_proxy", "--dir=/cloudsql",
                         "-instances=<%=deployment.cloud_sql_instance%>",
                         "-credential_file=/secrets/gcloud/credentials.json"]
+              env: []
               volumeMounts:
                 - *cloud_credentials_volume
             <% end %>
@@ -68,7 +74,8 @@ documents:
             - &logs_container # print to stdout all log files
               name: print-logs
               image: busybox
-              command: [/bin/sh, -c, 'until find log/*.log; do sleep 1; done; tail -n+1 -f log/*.log']
+              command: [/bin/sh, -c, 'until find /app/log/*.log; do sleep 1; done; tail -n+1 -f /app/log/*.log']
+              env: []
               volumeMounts:
                 - *log_volume
 
@@ -83,6 +90,17 @@ documents:
             - name: applog
               emptyDir: {}
 
+            # Custom volumes
+            # { my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }
+            <% (deployment.custom_volumes || {}).each do |name, vol| %>
+            - name: <%= name %>
+              <%= vol[:kind] %>:
+                <% vol[:settings].each do |k, v| %>
+                <%= k %>: <%= v %>
+                <% end %>
+            <% end %>
+
+
   <% if deployment.job_name %>
   - apiVersion: apps/v1
     kind: Deployment
@@ -108,7 +126,7 @@ documents:
               <% end %>
 
             <% if deployment.job_sidekiq_alive_gem %>
-              <%= include_template "_sidekiq_alive_gem.yml.erb" %>
+              <%= include_template "_sidekiq_alive_gem.yml" %>
             <% else %>
               ports: [ ]
               <% if (deployment.job_services || []).any? %>
@@ -132,5 +150,5 @@ documents:
   <% end %>
 
   <% if deployment.replicas_range %>
-  <%= include_template "_replicas.yml.erb" %>
+  <%= include_template "_replicas.yml" %>
   <% end %>

data/lib/templates/ingress.yml

@@ -1,11 +1,5 @@
 <% if ingress.domain_name %>
-apiVersion: networking.gke.io/v1beta1
-kind: ManagedCertificate
-metadata:
-  name: '<%=ingress.certificate_name%>'
-spec:
-  domains: # does not support for willcard domains
-    - '<%=ingress.domain_name%>'
+<%= include_template "certificate.yml" %>
 <% end %>
 
 ---

data/lib/templates/service.yml

@@ -1,3 +1,4 @@
+<% if cloud.name == 'gcloud' %>
 ---
 # used to increase request timeout
 apiVersion: cloud.google.com/v1beta1
@@ -6,16 +7,17 @@ metadata:
   name: '<%=service.config_name%>'
 spec:
   timeoutSec: 1800
-
 ---
-
+<% end %>
 
 kind: Service
 apiVersion: v1
 metadata:
   name: '<%=service.name%>'
   annotations:
+    <% if cloud.name == 'gcloud' %>
     beta.cloud.google.com/backend-config: '{"ports": {"80":"<%=service.config_name%>"}}'
+    <% end %>
 spec:
   selector:
     name: '<%=deployment.name%>'

data/lib/templates/settings.rb

@@ -14,6 +14,7 @@ settings = {
     # job_name: "#{app_name}-job", # enable if there is any background service
     # job_command: 'bundle exec sidekiq -C config/sidekiq.yml',
     # job_services: ['sidekiq', 'cron'] # list of linux services needed.
+    # custom_volumes: { my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }
   },
   ingress: {
     name: "#{app_name}-ingress",
@@ -26,7 +27,7 @@ settings = {
     project_name: 'my-project-name',
     cluster_name: 'my-cluster-name',
     cluster_region: 'europe-west4-a',
-    docker_build_cmd: 'build -f Dockerfile'
+    docker_build_cmd: 'build -f Dockerfile' # using target: 'build --target production -f Dockerfile '
   },
   secrets: {
     name: "#{app_name}-secrets"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.5'
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -40,9 +40,10 @@ files:
 - lib/kubernetes_helper/railtie.rb
 - lib/kubernetes_helper/version.rb
 - lib/templates/README.md
-- lib/templates/_replicas.yml.erb
-- lib/templates/_sidekiq_alive_gem.yml.erb
+- lib/templates/_replicas.yml
+- lib/templates/_sidekiq_alive_gem.yml
 - lib/templates/cd.sh
+- lib/templates/certificate.yml
 - lib/templates/deployment.yml
 - lib/templates/ingress.yml
 - lib/templates/secrets.yml