kubernetes_helper 1.12.1 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82e5c03c90bdac6d509cc112dac0ae783b3114758e259bad14e45a85959e6e4
-  data.tar.gz: c8324c75469a8ac9d7239eb62b740bfc60da6d0baac8c6db9c021edd544f62c9
+  metadata.gz: ac69b9f6972032067714455719b0c5563e5f2c0fed0a82a21665fdbae3b7cf41
+  data.tar.gz: a5b8d1b32f9fe5d9d8cdc6e96e45e0d96090db42f61bbfb11c896bd6ec92c5dd
 SHA512:
-  metadata.gz: 636ad611aaf5b8f6b43a4c13643302f9efd33879476feec8c87701a4506220db9c7df3536772b0d24aba087692a856fd7f2b61d757b6e2967ad9507b6ec97e94
-  data.tar.gz: cb5a3c6a14edf82b6577f4bd0d98e21b0d92c2fce74fcf6bafca06466713dd377bcb98ec3d0d9fe087e24e2b6f943e22d31d77393b2ec48e5d95ed41eaf65d8e
+  metadata.gz: 1d0189b8f37392fcaeba4e8982936f3ddc8fd6bfd4866cd47f04b5f8989e12f95863de50fb6a9201f7a58ca07ca00c4a1ceb1445fe4857eed07ad79a83c1ca6c
+  data.tar.gz: d39a3d77f973eb1e05c8dc5357b22102f6cf7bb0baa24ccbeb96d88a9c134b4f1ded05c40588e6e4baff74adf0d46d709897e3123798c172f60c142a775bbbb8

data/README.md

@@ -61,6 +61,7 @@ Below settings are used when running Continuous Deployment
 - `continuous_deployment.cluster_region`: Cluster region name. Sample: `europe-west4-a`
 - `continuous_deployment.docker_build_cmd`: Docker command to build the corresponding image. Sample: `build --target production -f Dockerfile `
 - `continuous_deployment.update_deployment` (Boolean, default: false): If true permits to re-generate and update the k8s deployment(s) before applying the new version (new docker image) 
+- `continuous_deployment.before_building_image` (String, default: empty): Add the ability to enter commands before building docker image 
 
 Below settings are used when configuring the application in the k8s environment
 - `deployment.name` (String): Web deployment name (Note: Underscores are not accepted). Sample: `my-app`  

data/lib/kubernetes_helper/version.rb

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

data/lib/kubernetes_helper.rb

@@ -14,7 +14,7 @@ module KubernetesHelper
 
   # @param env_name (String)
   # @return [Hash]
-  def self.load_settings
+  def self.load_settings # rubocop:disable Metrics/MethodLength:
     config_file = File.join(settings_path, 'settings.rb')
     load config_file
 
@@ -30,7 +30,7 @@ module KubernetesHelper
   end
 
   def self.deep_merge(hash1, hash2)
-    merger = proc { |_key, v1, v2| v1.kind_of?(Hash) && v2.kind_of?(Hash) ? v1.merge(v2, &merger) : v2 }
+    merger = proc { |_key, v1, v2| v1.is_a?(Hash) && v2.is_a?(Hash) ? v1.merge(v2, &merger) : v2 }
     hash1.merge(hash2, &merger)
   end
 

data/lib/templates/cd.sh

@@ -37,6 +37,7 @@ then
 fi
 
 
+<%=continuous_deployment.before_building_image || ''%>
 ALREADY_DEPLOYED="$(gcloud container images list-tags --format='get(tags)' $IMAGE_NAME | grep $CI_COMMIT_SHA || :;)"
 if [ -z $ALREADY_DEPLOYED ]
 then
@@ -44,11 +45,12 @@ then
   echo "****** image not created yet, building image..."
   docker $DOCKER_BUILD_CMD -t $DEPLOY_NAME .
   docker push $DEPLOY_NAME
+else
+  echo "****** image was already created: $ALREADY_DEPLOYED"
 fi
 
 echo "****** tagging image $DEPLOY_NAME as $LATEST_NAME"
-docker tag $DEPLOY_NAME $LATEST_NAME
-docker push $LATEST_NAME
+gcloud container images add-tag --quiet $DEPLOY_NAME $LATEST_NAME
 
 ## Update new secrets defined in secrets.yml as ENV vars for deployments
 <% if continuous_deployment.update_deployment %>

data/lib/templates/deployment.yml

@@ -30,7 +30,7 @@ documents:
               import_secrets: ['secrets.yml', '<%=secrets.name%>']
               ports:
                 - containerPort: &port <%= deployment.app_port || 3000 %>
-                  name: '<%=service.backend_port_name%>'
+                  name: '<%=service.backend_port_name || 'b-port'%>'
 
               <% if deployment.liveness_path %>
               livenessProbe: &liveness_probe

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.4
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb