kubernetes_helper 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59945c95287cd19d19577b1e96f5f6b9853ce4e40a82b022de362ba676ad5bf9
-  data.tar.gz: 0b5360c14ea7b0f14300b87112225e9421090299ae099f60cf07b48a22ecebde
+  metadata.gz: a161c5dd4e43f7a71dfb8c9d0589291ffd52f9547c602f3cd8a5f22b5f1f9dd3
+  data.tar.gz: 9d2dc621a9cb9cc5145ef5922c95f7f7218ff69c509830dc18d6b4c8affe6601
 SHA512:
-  metadata.gz: 8057efca5943cccfa92bc1a8a3a696f5ca2f3b3b21415da3923794c4674848ba7797098e5d718f2b7da376c9d05634182185ea45572500cc9af9481b1246f107
-  data.tar.gz: 2dd11b252b27be829f8d1de244409c37eda5104f479dda45839b555e9f92423fc0142122e536c3824add5c73e91eba79ca0a5779f26dc9f78ba6bc95441ad942
+  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.6.1'
+  VERSION = '1.7.0'
 end

data/lib/templates/cd.sh

@@ -43,14 +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
 
   <%= include_template "_cd_apply_images.sh" %>
-
-  <% if continuous_deployment.update_deployment %>
-    kubernetes_helper run_yml 'deployment.yml' 'kubectl apply'
-  <% end %>
 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
@@ -79,6 +80,8 @@ documents:
               volumeMounts:
                 - *log_volume
 
+            <%= include_template "_custom_containers.yml", { pod: 'web' } %>
+
           terminationGracePeriodSeconds: 120
           volumes:
             <% if deployment.cloud_secret_name %>
@@ -147,6 +150,8 @@ documents:
             <% end %>
 
             - <<: *logs_container
+
+            <%= include_template "_custom_containers.yml", { pod: 'job' } %>
   <% end %>
 
   <% if deployment.replicas_range %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -41,6 +41,7 @@ files:
 - 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