kubernetes_helper 1.10.0 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad11b73ac23d45b86c9b5789ae815af2ee565d6360462368e96c4b15dfcc3301
-  data.tar.gz: 61df31315a5b137c9e1c4575002b875f87175d72d5319cf0e1439d8c01afaee6
+  metadata.gz: 235b38e0301bf3d021a192dc336183f89bd3ca214d5c5464b701d4ed03e1faef
+  data.tar.gz: 28ffb4e42d000427b08643c14f24b626d2ee78ace071219bddaf64b35b7b88af
 SHA512:
-  metadata.gz: f1a177f81e8bf2a9337d233369c39dd7cc42e2baf0c7dca7fdba25984d86014837db2207bcab10a1b9f8b8bc2060b55dee8c0dc0054074ac4846592856c8d778
-  data.tar.gz: 8be87c0b86cc7e4a7711d20d6360e96d5b99d7655ea3a3bed0a8291dec59cc552a9a326911355d2427f0e5548c0976045d7d28204af1c9dcee2c5fd1bc2af1f9
+  metadata.gz: f8556cd967823100b097347f1a02e2e8681ab16e319c44faf5baa959accb3ca52c08339c1eb1ca04f61c712f63d8e8b76e51e21c5caa1da78e8f79c82c541d8e
+  data.tar.gz: bdbf65ea0309743fb11567d30b2be2bea66382932553a253860762aef5637e04781e07fc78119735d1d9ea30d2e0854d2c58478cc75627b4f100e2710e6973e2

data/README.md

@@ -54,8 +54,8 @@ it looks for the file inside kubernetes_helper template folder.
 
 ## Settings API
 Below settings are used when running Continuous Deployment
-- `continuous_deployment.image_name` (String, Optional): Partial docker image url where `:latest` will be automatically added. Sample: `gcr.io/my-account/my_app_name`
-- `continuous_deployment.image` (String, Optional, is mandatory if `image_name` is empty): Full docker image url. Sample: `gcr.io/my-account/my_app_name:latest`
+- `continuous_deployment.image_name` (String): Partial docker image url. Sample: `gcr.io/my-account/my_app_name`
+- `continuous_deployment.image_tag` (String, default 'latest'): Image tag to be used for this application
 - `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`
@@ -71,7 +71,9 @@ Below settings are used when configuring the application in the k8s environment
 - `deployment.env_vars` (Hash, optional): List of static env variables (Note: Not recommended for sensitive values). Sample: `{ 'RAILS_ENV' => 'production' }`
 - `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. Sample: `{ my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }`
+- `deployment.custom_volumes` (Hash<name: path>, Optional): Custom volumes to be mounted. 
+    Sample volume: `{ my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }`    
+    Sample secret: `{ pubsub_secret: { kind: 'secret', mount_path: '/secrets/pubsub', settings: { secretName: 'my_secret_name' } } }`
 
 - `deployment.job_name` (String, optional): Job deployment name (Note: Underscores are not accepted). Sample: `my-app-job`. Note: This deployment is created only if this value is present
 - `deployment.job_command` (String, optional): Bash command to be used for job container. Sample: `bundle exec sidekiq`
@@ -90,6 +92,8 @@ Below settings are used when configuring the application in the k8s environment
 - `ingress.certificate_name` (Optional): Ssl certificate is not created nor assigned if empty value. Sample: `my-app-lets-encrypt`. Note: requires `certificate_domain` 
 - `ingress.certificate_domain` (Optional): Domain name for the certificate. Sample: `myapp.com`. Note: does not support for willcard domains
 
+- `cloud.name` (String, optional): Cloud service name. Default `gcloud`.  
+
 ### Partials
 - `_container_extra_settings.yml` Partial template to add custom container settings. Receives `pod` as local variable (`web` | `job` | `cloudsql` | `logs`). Sample:
   ```yaml

data/lib/kubernetes_helper/version.rb

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

data/lib/templates/_job_liveness.yml

@@ -3,7 +3,7 @@
               livenessProbe: &liveness_probe
                 exec:
                    command: [ /bin/sh, -c,
-                     'if [ $(ps -ef | grep "<%= deployment.job_services.join("\|") %>" | grep -v "grep" | wc -l) -lt <%= deployment.job_services.count %> ]; then
+                     'if [ $(ps -ef | grep "<%= deployment.job_services.join("\\|") %>" | grep -v "grep" | wc -l) -lt <%= deployment.job_services.count %> ]; then
                                echo "Some required services are not running"; exit 1;
                            fi' ]
                 initialDelaySeconds: 120

data/lib/templates/_volumes.yml

@@ -8,7 +8,6 @@
               emptyDir: {}
 
             # Custom volumes
-            # { my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }
             <% (deployment.custom_volumes || {}).each do |name, vol| %>
             - name: <%= name %>
               <%= vol[:kind] %>:

data/lib/templates/cd.sh

@@ -15,7 +15,7 @@ DOCKER_BUILD_CMD="<%=continuous_deployment.docker_build_cmd || 'build -f Dockerf
 CI_COMMIT_SHA=$(git rev-parse --verify HEAD || :)
 CI_COMMIT_SHA=${CI_COMMIT_SHA:-$(date +%s) }
 DEPLOY_NAME="${IMAGE_NAME}:${CI_COMMIT_SHA}"
-LATEST_NAME="${IMAGE_NAME}:latest"
+LATEST_NAME="${IMAGE_NAME}:<%= continuous_deployment.image_tag || 'latest' %>"
 
 if [ ! -z "$KB_AUTH_TOKEN" ]
 then
@@ -37,10 +37,17 @@ then
 fi
 
 
-## Build and push containers
-docker $DOCKER_BUILD_CMD -t $DEPLOY_NAME .
+ALREADY_DEPLOYED="$(gcloud container images list-tags --format='get(tags)' $IMAGE_NAME | grep $CI_COMMIT_SHA || :;)"
+if [ -z $ALREADY_DEPLOYED ]
+then
+  ## Build and push containers
+  echo "****** image not created yet, building image..."
+  docker $DOCKER_BUILD_CMD -t $DEPLOY_NAME .
+  docker push $DEPLOY_NAME
+fi
+
+echo "****** tagging image $DEPLOY_NAME as $LATEST_NAME"
 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
@@ -54,5 +61,4 @@ for deployment in "${deployments[@]}"; do
   [ -z "$deployment" ] && continue # if empty value
 
   <%= include_template "_cd_apply_images.sh" %>
-done
-
+done

data/lib/templates/deployment.yml

@@ -21,12 +21,7 @@ documents:
         spec: &template_spec
           containers:
             - &app_container
-              <% if continuous_deployment.image_name %>
-              image: '<%= continuous_deployment.image_name %>:latest'
-              <% else %>
-              image: '<%= continuous_deployment.image %>'
-              <% end %>
-
+              image: '<%= continuous_deployment.image_name %>:<%= continuous_deployment.image_tag || "latest" %>'
               <% if deployment.command %>
               command: ["/bin/bash", "-c", "<%= deployment.command %>"]
               <% end %>

data/lib/templates/settings.rb

@@ -24,7 +24,8 @@ settings = {
     certificate_domain: is_production ? 'myapp.com' : 'beta.myapp.com' # nil if domain is not required
   },
   continuous_deployment: {
-    image: "gcr.io/my-account/#{app_name}:latest",
+    image_name: "gcr.io/my-account/#{app_name}",
+    image_tag: 'latest',
     project_name: 'my-project-name',
     cluster_name: 'my-cluster-name',
     cluster_region: 'europe-west4-a',

metadata

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