kubernetes_helper 1.2 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a680149c9a36ebc58fc0f7560a1257bc48bedfbf8a12ed93cfed112b12799407
-  data.tar.gz: b0b0dafefba5594194bed8bf990ace04f04297939f2861575d79b84c716aacca
+  metadata.gz: 91be870ea9d9d07de0ef4fb9e5c02094929b6d89fa7229aed5286877ff48dbca
+  data.tar.gz: 656ec2ce0a6ef926e6166da26fff8a493b6648984915f09da47bbd2913c0fbb3
 SHA512:
-  metadata.gz: 2b3829818e7e37a552fe645686b954a27ac7779ab6097aaba16fe3b6b91538c471c4501b9c9d1346230737553772058ae0c4cc5183b4fe61ca1a289cf5422d24
-  data.tar.gz: c98898c74f76a1d796387953450360a5d167b070a23461a58f3ae20b93a840906920fc191b196354132ff124925d6c877bd1baf28a60a5d6f766fd7c0af89e60
+  metadata.gz: 25e41a5e0a09dd15dcd6073d3d7278786d72916e6a9dc288e4c1d8380177d31d64c79e0ab3f164daae0e8f32e77ae52ec85d3a958856fd787a7be7b1523d2d49
+  data.tar.gz: 3de36d890e9c2211854cbaabe76e662a7fa4d60696c88d6c943ca05a55164fa829eee988bb80d6b2a2da914ad137e040c17ccc1644c9b0c981c193faafebce45

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.2'
+  VERSION = '1.6'
 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/_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

@@ -48,6 +48,5 @@ 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

@@ -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
@@ -85,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

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.2'
+  version: '1.6'
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -40,6 +40,7 @@ files:
 - lib/kubernetes_helper/railtie.rb
 - lib/kubernetes_helper/version.rb
 - lib/templates/README.md
+- lib/templates/_cd_apply_images.sh
 - lib/templates/_replicas.yml
 - lib/templates/_sidekiq_alive_gem.yml
 - lib/templates/cd.sh