kubernetes_helper 1.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 954aee8be3740b9cedb7496bd66ad857328ee8e1bf72a3571947bc70f849d97a
-  data.tar.gz: e9a33fa7278d6fd5eb844067c5378490588ce44e71df439c6e5178e24fcc5e73
+  metadata.gz: a161c5dd4e43f7a71dfb8c9d0589291ffd52f9547c602f3cd8a5f22b5f1f9dd3
+  data.tar.gz: 9d2dc621a9cb9cc5145ef5922c95f7f7218ff69c509830dc18d6b4c8affe6601
 SHA512:
-  metadata.gz: bab608c022fec18c45f6a0aa84f5d3528d0e455d1cf9670a3c07c8cc65d4115642c924d9d1482140037892d7e48282826b98ed55ed87d923a8aed5b809ca0c52
-  data.tar.gz: a8a65ba45e6c362928f07788909497b8bb8ec8eb152ad72ea998c0af5f55bb9d0de06adc94ff256d97b2719da4b8aec43f606739999cd753825670cef020f3d1
+  metadata.gz: 1bbcb9957df2086ce5bfdd668ff1ab19801fdb475f3569ff30db898fe9bb5626ed52d62ed4ac72cc58c9450245bfa97f2dcfdb090805310a3bcad392602ea93d
+  data.tar.gz: 6a00e52c99aabf37131a14b178eee76a5320e3d428f851c54da629e303396ad6542e735870368187b189411ae2e00f1004b48df76a565cfad2f1f1434bede444

data/lib/kubernetes_helper/core.rb

@@ -11,8 +11,8 @@ module KubernetesHelper
       binding
     end
 
-    def include_template(name)
-      render_template.call(name)
+    def include_template(name, locals = {})
+      render_template.call(name, locals)
     end
   end
 
@@ -36,8 +36,8 @@ module KubernetesHelper
 
     # @param text (String)
     # Sample: replicas: '#{deployment.replicas}'
-    def replace_config_variables(text)
-      values = config_values.map do |key, value| # rubocop:disable Style/HashTransformValues
+    def replace_config_variables(text, locals = {})
+      values = config_values.merge(locals: locals).map do |key, value| # rubocop:disable Style/HashTransformValues
         [key, value.is_a?(Hash) ? OpenStruct.new(value) : value]
       end.to_h
       values[:render_template] = method(:render_template)
@@ -75,10 +75,10 @@ module KubernetesHelper
       end
     end
 
-    def render_template(template_name)
+    def render_template(template_name, locals = {})
       path = KubernetesHelper.settings_path(template_name, use_template: true)
       text = "\n#{File.read(path)}"
-      replace_config_variables(text)
+      replace_config_variables(text, locals)
     end
 
     def static_env_vars
@@ -91,10 +91,11 @@ module KubernetesHelper
     end
 
     # parse secrets auto importer
-    def parse_import_secrets(document)
+    def parse_import_secrets(document) # rubocop:disable Metrics/AbcSize
       containers = document.dig('spec', 'template', 'spec', 'containers') || []
       containers.each do |container|
-        container['env'] = (container['env'] || []) + static_env_vars
+        container['env'] = (container['env'] || [])
+        container['env'] = container['env'] + static_env_vars if container.delete('static_env')
         if container['import_secrets']
           container['env'] = container['env'] + import_secrets(*container['import_secrets'])
           container.delete('import_secrets')

data/lib/kubernetes_helper/version.rb

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

data/lib/templates/_cd_apply_images.sh

@@ -0,0 +1,2 @@
+  kubectl set image deployment/$deployment $deployment=$DEPLOY_NAME
+  [ "$deployment" = "${deployments[0]}" ] && kubectl rollout status deployment/$deployment || true

data/lib/templates/cd.sh

@@ -43,11 +43,16 @@ docker tag $DEPLOY_NAME $LATEST_NAME
 docker push $DEPLOY_NAME
 docker push $LATEST_NAME
 
+## Update new secrets defined in secrets.yml as ENV vars for deployments
+<% if continuous_deployment.update_deployment %>
+  kubernetes_helper run_yml 'deployment.yml' 'kubectl apply'
+<% end %>
+
 ## Apply deployments
 IFS=',' read -r -a deployments <<< "$DEPLOYMENTS"
 for deployment in "${deployments[@]}"; do
   [ -z "$deployment" ] && continue # if empty value
 
-  kubectl set image deployment/$deployment $deployment=$DEPLOY_NAME
-  [ "$deployment" = "${deployments[0]}" ] && kubectl rollout status deployment/$deployment || true
+  <%= include_template "_cd_apply_images.sh" %>
 done
+

data/lib/templates/deployment.yml

@@ -26,6 +26,7 @@ documents:
               command: ["/bin/bash", "-c", "<%= deployment.command %>"]
               <% end %>
               name: *app_name
+              static_env: true
               import_secrets: ['secrets.yml', '<%=secrets.name%>']
               ports:
                 - containerPort: &port 3000
@@ -54,6 +55,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
@@ -74,6 +80,8 @@ documents:
               volumeMounts:
                 - *log_volume
 
+            <%= include_template "_custom_containers.yml", { pod: 'web' } %>
+
           terminationGracePeriodSeconds: 120
           volumes:
             <% if deployment.cloud_secret_name %>
@@ -85,6 +93,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
@@ -131,6 +150,8 @@ documents:
             <% end %>
 
             - <<: *logs_container
+
+            <%= include_template "_custom_containers.yml", { pod: 'job' } %>
   <% end %>
 
   <% if deployment.replicas_range %>

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,8 @@ 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 '
+    update_deployment: false # permits to reload secrets and re-generate/update deployment yaml
   },
   secrets: {
     name: "#{app_name}-secrets"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.7.0
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -40,6 +40,8 @@ files:
 - lib/kubernetes_helper/railtie.rb
 - lib/kubernetes_helper/version.rb
 - lib/templates/README.md
+- lib/templates/_cd_apply_images.sh
+- lib/templates/_custom_containers.yml
 - lib/templates/_replicas.yml
 - lib/templates/_sidekiq_alive_gem.yml
 - lib/templates/cd.sh