kubernetes_helper 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad11b73ac23d45b86c9b5789ae815af2ee565d6360462368e96c4b15dfcc3301
-  data.tar.gz: 61df31315a5b137c9e1c4575002b875f87175d72d5319cf0e1439d8c01afaee6
+  metadata.gz: c0b83d896c9cffe12e38bd7c7ed4ecf56ed2eaa45836338c00d387655bd4f451
+  data.tar.gz: 9b8e19cb71692e6ea90066c3cb5120786a85e6402e0ae9e156bdbf75d0f3de31
 SHA512:
-  metadata.gz: f1a177f81e8bf2a9337d233369c39dd7cc42e2baf0c7dca7fdba25984d86014837db2207bcab10a1b9f8b8bc2060b55dee8c0dc0054074ac4846592856c8d778
-  data.tar.gz: 8be87c0b86cc7e4a7711d20d6360e96d5b99d7655ea3a3bed0a8291dec59cc552a9a326911355d2427f0e5548c0976045d7d28204af1c9dcee2c5fd1bc2af1f9
+  metadata.gz: 0b60c04186e29c3a729244b669385f7614b6812b2bbf5aeb8418a86f739737e56ee1e19e4de9eb202218e763492a76c14b7128a64f702d4a1288b0d8f1a0ffaa
+  data.tar.gz: e39bfd0335359f746ad66f5791f636c056f3749c7abe2405c0e17f72475935bc03a3b7fc41faec095f030cfe8e0b8785a6369eea479953de6e02f8795de76061

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`

data/lib/kubernetes_helper/version.rb

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

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,14 @@ 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
+  docker $DOCKER_BUILD_CMD -t $DEPLOY_NAME .
+  docker push $DEPLOY_NAME
+fi
 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 +58,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.0
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb