kubernetes_helper 1.12.2 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3744c42d6ab40795fb6d4b576828fd08515df656fc90cbd01f4b36e767adc5fe
-  data.tar.gz: d649ca13db0aeddc21134aecc8c4efc6c8fb3c4491e4827003d66a2009ae3f5f
+  metadata.gz: 671e4935f2fa146de59fab6b0bedc9a994fb061c106d14ecad194360b4433a7e
+  data.tar.gz: 5deea0563a57c83b31c38870548c43ed8f97400187b83d4166e2879cb83904da
 SHA512:
-  metadata.gz: a42e4edaef1e91207e824160e2db44350c744e6be639c769944ffb444ca1c848038181a317c7d98a8790979aabdf305940d49725801fa291751b2aa9f19f9cb3
-  data.tar.gz: 12fb8ea61be765ef18a031606573af0c5fcb0bfc6d155df3f8619b606d70116555e7333612248bdc4a7c6498ced79d5044984fe06f8bee44befdaeac259f2ec7
+  metadata.gz: cea87bbc5e92dbf20c4cabd3f6bfc88e78027bb1b349abaa43b39335e4a3aa4da7a57d4260e6415fdd3934e845282859062943d292ef63807fe48fb678aad6c2
+  data.tar.gz: b767e7a995c1b8c4300e11df0c1df928b6865beffb320810864a504b94e39b27820e7fffc5da0cc2e25a349535f9583bbd07112eb36b023ea84268e181e10892

data/README.md

@@ -61,6 +61,8 @@ 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 
+- `continuous_deployment.after_building_image` (String, default: empty): Add the ability to enter commands after 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.2'
+  VERSION = '1.12.5'
 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

@@ -42,15 +42,16 @@ if [ -z $ALREADY_DEPLOYED ]
 then
   ## Build and push containers
   echo "****** image not created yet, building image..."
+  <%=continuous_deployment.before_building_image || ''%>
   docker $DOCKER_BUILD_CMD -t $DEPLOY_NAME .
+  <%=continuous_deployment.after_building_image || ''%>
   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.2
+  version: 1.12.5
 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