kubernetes_helper 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 528e61587a3011330c7e474b523ce04079c8e49483bf894d5eb1806927436888
-  data.tar.gz: 9df4e7aab70108b75831077d2f4390067e5807664050f70e1557f504835144bd
+  metadata.gz: 3bed0753481fee12fa822da715a6836b55fb561deaca02e8763e59d05b3edc6b
+  data.tar.gz: 28d56d40d55c667e479ee26126fc7014415afec77ee884eb58daac2c4e60809e
 SHA512:
-  metadata.gz: 9ed371a62084598f9bb4755df54ca059ffbeb729731555e4a6a6cf58dceecc0c347741921b5c46fc11408a937c914ea2d3fddaf3da94bc801dd6cd7f9ecc1ed8
-  data.tar.gz: 6248035be5a30995594a39ad56b73b811935b3b55988d067173a530ee0522294f6afb0e6361f664d4f696e7b370ce7b816ed74a53cb3f416c584e12c76ff023d
+  metadata.gz: d4d8b5606a4d3d9649de1add4341dcea076e2892e2d908d24f1cce5c14fb206b9bd779da7546544634b0341806163f3949f98c24bdd9a0a16dbf4149fa597117
+  data.tar.gz: 331f4263fb0ad4fd29bda318f079e36e0954c58bd8a50dc4507e49d0e88043afcfe03a8bad22390d5776042bd07837d4232c5b7879a06074870369274866537d

data/README.md

@@ -11,7 +11,10 @@ kubernetes_helper generate_templates
 ```
 Note: Requires ruby 1.7+      
 
-## Usage
+## Deployment
+Once you generated the basic templates, it comes with the corresponding [readme.md](/lib/templates/README.md) which includes all the steps to deploy your application.
+
+## API
 - Run any kubernetes document    
   `DEPLOY_ENV=<env name> kubernetes_helper run_deployment "<document name>" "<bash command>"`    
   Evaluates the kubernetes document with the following details:
@@ -46,10 +49,7 @@ When performing a command or script, the setting variables are replaced based on
 All these setting variable values are configured in `.kubernetes/settings.rb` which defines the values based on `DEPLOY_ENV`.     
 These setting variables use [erb](https://github.com/ruby/erb) template gem to define variable replacement and conditional blocks, and so on.
 Note: Setting variable values are referenced as an object format instead of a hash format for simplicity.
-
-
-## Deployment
-Once you generated the basic templates, it comes with the corresponding [readme.md](/lib/templates/README.md) which includes all the steps to deploy your application.  
+  
 
 ## Sample
 https://owen2345.github.io/kubernetes_helper/

data/lib/kubernetes_helper/version.rb

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

data/lib/templates/cd.sh

@@ -12,26 +12,30 @@ 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=$(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"
-AUTH_PATH="$SCRIPT_DIR/k8s-auth-token.json"
 
-rm -f -- $AUTH_PATH
-echo $KB_AUTH_TOKEN >> $AUTH_PATH
-
-## ***** GOOGLE CONNECTOR
-# Download and install Google Cloud SDK
-if [ -z "$(which gcloud)" ]; then
-  export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash && source /home/runner/google-cloud-sdk/path.bash.inc &&  gcloud --quiet components update kubectl
+if [ ! -z "$KB_AUTH_TOKEN" ]
+then
+  AUTH_PATH="$SCRIPT_DIR/k8s-auth-token.json"
+  rm -f -- $AUTH_PATH
+  echo $KB_AUTH_TOKEN >> $AUTH_PATH
+
+  ## ***** GOOGLE CONNECTOR
+  # Download and install Google Cloud SDK
+  if [ -z "$(which gcloud)" ]; then
+    export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash && source /home/runner/google-cloud-sdk/path.bash.inc &&  gcloud --quiet components update kubectl
+  fi
+
+  # Connect to cluster
+  gcloud auth activate-service-account --key-file $AUTH_PATH --project $PROJECT_NAME
+  gcloud docker --authorize-only --project $PROJECT_NAME
+  gcloud container clusters get-credentials $CLUSTER_NAME --region $CLUSTER_REGION
+  ## ***** END GOOGLE CONNECTOR
 fi
 
-# Connect to cluster
-gcloud auth activate-service-account --key-file $AUTH_PATH --project $PROJECT_NAME
-gcloud docker --authorize-only --project $PROJECT_NAME
-gcloud container clusters get-credentials $CLUSTER_NAME --region $CLUSTER_REGION
-## ***** END GOOGLE CONNECTOR
-
 
 ## Build and push containers
 docker $DOCKER_BUILD_CMD -t $DEPLOY_NAME .

data/lib/templates/deployment.yml

@@ -46,11 +46,15 @@ documents:
                 - &log_volume
                   name: applog
                   mountPath: /app/log
+
+                <% if deployment.cloud_secret_name %>
                 - &cloud_credentials_volume
                   name: gcloud-creds
                   mountPath: /secrets/gcloud
                   readOnly: true
+                <% end %>
 
+            <% if deployment.cloud_secret_name %>
             - &cloudsql_container
               image: gcr.io/cloudsql-docker/gce-proxy:1.09 # Cloud sql proxy
               name: cloudsql-proxy
@@ -59,6 +63,7 @@ documents:
                         "-credential_file=/secrets/gcloud/credentials.json"]
               volumeMounts:
                 - *cloud_credentials_volume
+            <% end %>
 
             - &logs_container # print to stdout all log files
               name: print-logs
@@ -69,9 +74,12 @@ documents:
 
           terminationGracePeriodSeconds: 120
           volumes:
+            <% if deployment.cloud_secret_name %>
             - name: gcloud-creds
               secret:
                 secretName: '<%=deployment.cloud_secret_name%>'
+            <% end %>
+
             - name: applog
               emptyDir: {}
 
@@ -116,7 +124,10 @@ documents:
               <% end %>
             <% end %>
 
+            <% if deployment.cloud_secret_name %>
             - *cloudsql_container
+            <% end %>
+
             - <<: *logs_container
   <% end %>
 

data/lib/templates/settings.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 is_production = ENV['DEPLOY_ENV'] == 'production'
-app_name = is_production ? 'my_app' : 'my_beta_app'
+app_name = is_production ? 'my-app' : 'my-beta-app' # underscore not accepted
 settings = {
   deployment: {
     name: app_name,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - owen2345