kubernetes_helper 1.8.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8b8fba09e6bdb8ee80e82af9a966d53ba213d58294c894d4463aeba8ec66f44
-  data.tar.gz: dfb9d875daeee0399190208e4ff7c6b2136dc1cbd3550753fb4318551158f4c6
+  metadata.gz: 284a91c77c6a5aa796e2593eadbdcecd85a5b52e35ae7bb6dbd53cde80ef7067
+  data.tar.gz: dfe726e21ba3a03de4ad9cb272922d5f253b306f8a16996954f7efa29595a5f5
 SHA512:
-  metadata.gz: fcb3e3a26693625c437dafbfb38520a8db2aa7b4a4d9fc29804706e728e62c585a2c4aaaa3fabac1e081a9acbca4346a516148c95f28716400ba44ef53dc6136
-  data.tar.gz: 5f5f20d3dd0f582910a6e48bb1ec2c9b23da5ec7b8a72fcdd4c8338c6a8ea07ef60f442f41f22bd8587e4d0a0027758bb65ecfcefedb107a89e16e8abd2f65be
+  metadata.gz: e8ccc2bd6661de602e7eb2f21935fa16a8ddb344d3130f3ee7d8331025552675538cf321236b40360f119a58768700d85b9b80cabbc98fa0093e7d5ce337572f
+  data.tar.gz: 4b3185c7eb890ff9acb7e8ecdafbf85176f7a2e2703cd54e8fc1f0f4abe54b9112a00a27c1a2039c5cc5a718b17d1fd3a33eae9212d8b1764c0210babf02be04

data/README.md

@@ -9,7 +9,15 @@ cd my_app/
 gem install kubernetes_helper -v '~> 1.0'
 kubernetes_helper generate_templates
 ```
-Note: Requires ruby 1.7+      
+Note: Requires ruby 1.7+     
+
+## Configuration
+- Edit `.kubernetes/settings.rb` and enter or replace all settings with the valid ones
+- For special applications where default configurations are not enough, you can do the following: 
+    - Download the corresponding template from [lib/templates](lib/templates)
+    - Put it inside `.kubernetes` folder
+    - Customize based on your needs (You can add or use your custom variables from `settings.rb`)    
+    Note: The local template will be used instead of the default.
 
 ## 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.
@@ -21,7 +29,7 @@ Once you generated the basic templates, it comes with the corresponding [readme.
   - Supports for `- documents` to include multiple documents in a file and share yml variables between them (Sample: `lib/templates/deployment.yml#1`)
   - Replaces all setting values based on `DEPLOY_ENV`
   - Supports for secrets auto importer using `import_secrets: ['secrets.yml', '<%=secrets.name%>']` (Sample: `lib/templates/deployment.yml#29`)
-  - Supports for template including by `include_template 'template_name.yml.erb'`    
+  - Supports for sub templates by `include_template 'template_name.yml.erb', { my_local_var: 10 }`    
   Sample: `DEPLOY_ENV=beta kubernetes_helper run_deployment "deployment.yml" "kubectl create"`
    
 - Run kubernetes commands    
@@ -44,6 +52,69 @@ Once you generated the basic templates, it comes with the corresponding [readme.
 When performing a script it looks first for file inside .kubernetes folder, if not exist, 
 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): 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`
+- `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) 
+
+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`  
+- `deployment.replicas` (Integer): Quantity of replicas. Sample: `1`
+- `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.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.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`
+- `deployment.job_sidekiq_alive_gem` (Boolean, default false): If true will add liveness checker settings using `sidekiq_alive_gem` (`sidekiq_alive` gem needs to be present in your Gemfile)
+- `deployment.job_services` (Array, Optional, only `job_sidekiq_alive_gem` or `job_services` is allowed): List of linux service names that are required for a healthy job container. Sample: `['sidekiq', 'cron']` 
+
+
+- `secrets.name` (String): K8s secrets name where env vars will be saved and fetched from. Sample: `my-app-secrets`
+
+- `service.name`: K8s service name. Sample: `my-app-service`
+- `service.port_name`: Http port name to connect between k8s ingress and service. Sample: `http-port`. Note: max 15 characters
+- `service.backend_port_name` (String): Web backend port name to be connected between k8s service and web deployments. Sample: `b-port`. Note: max 15 characters
+
+- `ingress.name`: Name of k8s ingress for the app: Sample: `my-app-ingress`
+- `ingress.ip_name` (Optional): Static ip address is not created nor assigned if empty value. Sample: `my-app-static-ip`
+- `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
+               <% if locals[:pod] == 'job' %>
+               resources:
+                 requests:
+                   cpu: 50m
+                   memory: 256Mi
+                 limits:
+                   cpu: 500m
+                   memory: 1Gi
+               <% end %>
+  ``` 
+- `_custom_containers.yml` Partial template to add extra containers (Receives `pod` as local variable: `web` | `job`). Sample:
+```yaml
+           <% if locals[:pod] == 'job' %>
+           - name: scraper
+             image: owencio/easy_scraper
+             ...
+           <% end %>
+```
+- `_cd_apply_images.sh` Partial template to customize the process to apply the new version (new docker image)
+
 ## Templating
 When performing a command or script, the setting variables are replaced based on `DEPLOY_ENV`. 
 All these setting variable values are configured in `.kubernetes/settings.rb` which defines the values based on `DEPLOY_ENV`.     

data/lib/kubernetes_helper/version.rb

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

data/lib/templates/_custom_volumes.yml

@@ -0,0 +1,3 @@
+#            - name: dshm
+#              emptyDir:
+#                medium: Memory

data/lib/templates/_replicas.yml

@@ -9,4 +9,4 @@
         name: <%= deployment.name %>
       minReplicas: <%= deployment.replicas_range[0] %>
       maxReplicas: <%= deployment.replicas_range[1] %>
-      targetCPUUtilizationPercentage: 50
+      targetCPUUtilizationPercentage: <%= deployment.replicas_range[2] || 50 %>

data/lib/templates/_volumes.yml

@@ -0,0 +1,20 @@
+            <% if deployment.cloud_secret_name %>
+            - name: gcloud-creds
+              secret:
+                secretName: '<%=deployment.cloud_secret_name%>'
+            <% end %>
+
+            - name: applog
+              emptyDir: {}
+
+            # Custom volumes
+            # { my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }
+            <% (deployment.custom_volumes || {}).each do |name, vol| %>
+            - name: <%= name %>
+              <%= vol[:kind] %>:
+                <% vol[:settings].each do |k, v| %>
+                <%= k %>: <%= v %>
+                <% end %>
+              <% end %>
+
+            <%= include_template "_custom_volumes.yml", { pod: locals[:pod] } %>

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/certificate.yml

@@ -4,4 +4,4 @@ metadata:
   name: '<%=ingress.certificate_name%>'
 spec:
   domains: # does not support for willcard domains
-    - '<%=ingress.domain_name%>'
+    - '<%= ingress.domain_name || ingress.certificate_domain %>'

data/lib/templates/deployment.yml

@@ -21,7 +21,7 @@ documents:
         spec: &template_spec
           containers:
             - &app_container
-              image: '<%=continuous_deployment.image_name%>:latest'
+              image: '<%= continuous_deployment.image_name %>:<%= continuous_deployment.image_tag || "latest" %>'
               <% if deployment.command %>
               command: ["/bin/bash", "-c", "<%= deployment.command %>"]
               <% end %>
@@ -87,24 +87,7 @@ documents:
 
           terminationGracePeriodSeconds: 120
           volumes:
-            <% if deployment.cloud_secret_name %>
-            - name: gcloud-creds
-              secret:
-                secretName: '<%=deployment.cloud_secret_name%>'
-            <% end %>
-
-            - name: applog
-              emptyDir: {}
-
-            # Custom volumes
-            # { my_volume: { kind: 'hostPath', mount_path: '/', settings: { path: '..', type: 'Directory' } }  }
-            <% (deployment.custom_volumes || {}).each do |name, vol| %>
-            - name: <%= name %>
-              <%= vol[:kind] %>:
-                <% vol[:settings].each do |k, v| %>
-                <%= k %>: <%= v %>
-                <% end %>
-            <% end %>
+            <%= include_template "_volumes.yml", { pod: 'web' } %>
 
 
   <% if deployment.job_name %>
@@ -145,6 +128,9 @@ documents:
             - <<: *logs_container
 
             <%= include_template "_custom_containers.yml", { pod: 'job' } %>
+
+          volumes:
+            <%= include_template "_volumes.yml", { pod: 'job' } %>
   <% end %>
 
   <% if deployment.replicas_range %>

data/lib/templates/ingress.yml

@@ -1,4 +1,4 @@
-<% if ingress.domain_name %>
+<% if ingress.certificate_name %>
 <%= include_template "certificate.yml" %>
 <% end %>
 
@@ -17,7 +17,7 @@ metadata:
     kubernetes.io/ingress.global-static-ip-name: "<%=ingress.ip_name%>"
     <% end %>
 
-    <% if ingress.domain_name %>
+    <% if ingress.certificate_name %>
     networking.gke.io/managed-certificates: '<%=ingress.certificate_name%>'
     <% end %>
 

data/lib/templates/service.yml

@@ -4,7 +4,7 @@
 apiVersion: cloud.google.com/v1beta1
 kind: BackendConfig
 metadata:
-  name: '<%=service.config_name%>'
+  name: '<%=service.name%>-bconfig'
 spec:
   timeoutSec: 1800
 ---
@@ -16,7 +16,7 @@ metadata:
   name: '<%=service.name%>'
   annotations:
     <% if cloud.name == 'gcloud' %>
-    beta.cloud.google.com/backend-config: '{"ports": {"80":"<%=service.config_name%>"}}'
+    beta.cloud.google.com/backend-config: '{"ports": {"80":"<%=service.name%>-bconfig"}}'
     <% end %>
 spec:
   selector:

data/lib/templates/settings.rb

@@ -6,6 +6,7 @@ settings = {
   deployment: {
     name: app_name,
     replicas: is_production ? 2 : 1,
+    replicas_range: nil, # [min, max] or nil to ignore, sample: is_production ? [1, 2] : nil
     cloud_secret_name: "#{is_production ? 'production' : 'beta'}-cloud-secret",
     cloud_sql_instance: 'xxx:xxx:xxx=tcp:5432', # 5432 => postgres, 3306 => mysql
     env_vars: {}, # Sample: { 'CUSTOM_VAR' => 'value' }
@@ -20,10 +21,11 @@ settings = {
     name: "#{app_name}-ingress",
     ip_name: "#{app_name}-static-ip", # nil if static ip is not necessary
     certificate_name: "#{app_name}-lets-encrypt", # nil if ssl is not required
-    domain_name: is_production ? 'myapp.com' : 'beta.myapp.com' # nil if domain is not required
+    certificate_domain: is_production ? 'myapp.com' : 'beta.myapp.com' # nil if domain is not required
   },
   continuous_deployment: {
     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',
@@ -36,8 +38,7 @@ settings = {
   service: {
     name: app_name,
     port_name: 'http-port', # max 15 characters
-    backend_port_name: 'b-port', # max 15 characters
-    config_name: "#{app_name}-backend-config"
+    backend_port_name: 'b-port' # max 15 characters
   }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.11.1
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -43,9 +43,11 @@ files:
 - lib/templates/_cd_apply_images.sh
 - lib/templates/_container_extra_settings.yml
 - lib/templates/_custom_containers.yml
+- lib/templates/_custom_volumes.yml
 - lib/templates/_job_liveness.yml
 - lib/templates/_replicas.yml
 - lib/templates/_sidekiq_alive_gem.yml
+- lib/templates/_volumes.yml
 - lib/templates/cd.sh
 - lib/templates/certificate.yml
 - lib/templates/deployment.yml