kubernetes_helper 1.12.8 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7e78cceeb40228bdfb3dea0d9e89e9beb112e484eb61ca8e7302716b69abd4
-  data.tar.gz: 1b6eda67f29f936e66714f08b538ef868b1f3e3c76f67d3e4f2e09098898e5a1
+  metadata.gz: 9257b84ef107ed3b39ce537325de4357b348023becbf0f14fcf761bdf652d3f0
+  data.tar.gz: 77abef0bae873a41b1ed2fce90d49c55f07b43acbef6b578ae9b0e7f45716893
 SHA512:
-  metadata.gz: 2c7816fd3c3cea7dc303f2923b453338f4ad976cf577bea302d75e0b7c84ee0dee98fc58d06b76c9816de0dc14cb31b8ea0aa19ce7e5cc768bb20faf76cbee7e
-  data.tar.gz: ea90240216df3170b2185203cc1d27688950eb83130caee7e339b368501dfeb1c613a480895c17dadb7a3e235b3338cabd80871079b0a5d428b4309e7c3949be
+  metadata.gz: f2798fb189f4e2ab77507dd8095d0f2741ef70d163a03d98f734f6d4772395b7521c77aed051a97a9d5241fca3ef0d8cdc0d19c4ea430ea81ed0af7e4d9f89ca
+  data.tar.gz: 4446e493e3cb37ec030d99e1ede09738bce1e8cd17f16f35c95ded98c1a18213cb7997d03d7b3e6c6c59d273fcf5468a09cd709aaaca6f87859bfa5f44d419f5

data/README.md

@@ -59,10 +59,11 @@ Below settings are used when running Continuous Deployment
 - `continuous_deployment.project_name`: Cloud project name. Sample: `my-project-name`
 - `continuous_deployment.cluster_name`: Cluster cluster name. Sample: `my-cluster-name`
 - `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.docker_build_cmd` (deprecated): Docker command to build the corresponding image. Sample: `build --target production -f Dockerfile `
+- `continuous_deployment.docker_cmd` (String): Docker command to build the corresponding image.      
+  Simple docker image: `docker build -f Dockerfile -t $DEPLOY_NAME .`    
+  Docker image with target: `docker build --target production -f Dockerfile -t $DEPLOY_NAME .`        
 - `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`  
@@ -70,7 +71,10 @@ Below settings are used when configuring the application in the k8s environment
 - `deployment.replicas_range` (Array<min, max, cpu_percentage>, Optional): Defines the minimum and the maximum number of pods that could automatically be created when `CPUUtilizationPercentage` is above than defined. Sample: `[1, 3, 50]`
 - `deployment.cloud_secret_name` (String, Optional): K8s credentials name where cloud secrets will be saved (includes permission like DB). Sample: `my-app-cloud-secret`
 - `deployment.cloud_sql_instance` (String, Optional): Cloud sql instance name. Sample: `my-project:europe-west1:my-instance-name=tcp:5432` (5432 => postgres, 3306 => mysql)
-- `deployment.env_vars` (Hash, optional): List of static env variables (Note: Not recommended for sensitive values). Sample: `{ 'RAILS_ENV' => 'production' }`
+- `deployment.env_vars` (Hash, optional): List of static or external env variables (Note: Not recommended for sensitive values).      
+   Sample: `{ 'RAILS_ENV' => 'production' }`      
+   Example for external secrets: `{ PAPERTRAIL_PORT: { name: 'common_secrets', key: 'paper_trail_port' }` will import `paper_trail_port` value from `common_secrets` yml as `PAPERTRAIL_PORT`
+  
 - `deployment.command` (String, Optional): Bash command to be used for web containers. Sample: `rails s -b 0.0.0.0`
 - `deployment.liveness_path` (String, Optional): Relative path to be used for readiness and liveness checker of the web app. Sample: `/check_liveness`
 - `deployment.custom_volumes` (Hash<name: path>, Optional): Custom volumes to be mounted. 

data/lib/kubernetes_helper/core.rb

@@ -83,9 +83,11 @@ module KubernetesHelper
 
     def static_env_vars
       (config_values.dig(:deployment, :env_vars) || {}).map do |key, value|
+        external = value.is_a?(Hash)
+        value = { 'secretKeyRef' => { 'name' => value[:name], 'key' => value[:key].to_s } } if external
         {
           'name' => key.to_s,
-          'value' => value
+          (external ? 'valueFrom' : 'value') => value
         }
       end
     end

data/lib/kubernetes_helper/version.rb

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

data/lib/kubernetes_helper.rb

@@ -24,7 +24,8 @@ module KubernetesHelper
       },
       deployment: {
         log_container: true,
-        log_folder: '/app/log'
+        log_folder: '/app/log',
+        external_secrets: {}
       },
       service: {
         port_name: 'http-port',

data/lib/templates/cd.sh

@@ -10,7 +10,6 @@ IMAGE_NAME="<%=continuous_deployment.image_name%>"
 CLUSTER_NAME="<%=continuous_deployment.cluster_name%>"
 PROJECT_NAME="<%=continuous_deployment.project_name%>"
 CLUSTER_REGION="<%=continuous_deployment.cluster_region%>"
-DOCKER_BUILD_CMD="<%=continuous_deployment.docker_build_cmd || 'build -f Dockerfile'%>"
 
 CI_COMMIT_SHA=$(git rev-parse --verify HEAD || :)
 CI_COMMIT_SHA=${CI_COMMIT_SHA:-$(date +%s) }
@@ -42,9 +41,11 @@ 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 || ''%>
+  <% if continuous_deployment.docker_cmd %>
+    <%= continuous_deployment.docker_cmd %>
+  <% else %>
+    docker <%=continuous_deployment.docker_build_cmd || 'build -f Dockerfile'%> -t $DEPLOY_NAME .
+  <% end %>
   docker push $DEPLOY_NAME
 else
   echo "****** image was already created: $ALREADY_DEPLOYED"

data/lib/templates/settings.rb

@@ -35,7 +35,7 @@ settings = {
     project_name: 'my-project-name',
     cluster_name: 'my-cluster-name',
     cluster_region: 'europe-west4-a',
-    docker_build_cmd: 'build -f Dockerfile', # using target: 'build --target production -f Dockerfile '
+    docker_cmd: 'docker build -f Dockerfile -t $DEPLOY_NAME .', # using target: 'docker build --target production -f Dockerfile -t $DEPLOY_NAME .'
     update_deployment: false # permits to reload secrets and re-generate/update deployment yaml
   },
 }

metadata

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