kubernetes_helper 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a161c5dd4e43f7a71dfb8c9d0589291ffd52f9547c602f3cd8a5f22b5f1f9dd3
-  data.tar.gz: 9d2dc621a9cb9cc5145ef5922c95f7f7218ff69c509830dc18d6b4c8affe6601
+  metadata.gz: b8b8fba09e6bdb8ee80e82af9a966d53ba213d58294c894d4463aeba8ec66f44
+  data.tar.gz: dfb9d875daeee0399190208e4ff7c6b2136dc1cbd3550753fb4318551158f4c6
 SHA512:
-  metadata.gz: 1bbcb9957df2086ce5bfdd668ff1ab19801fdb475f3569ff30db898fe9bb5626ed52d62ed4ac72cc58c9450245bfa97f2dcfdb090805310a3bcad392602ea93d
-  data.tar.gz: 6a00e52c99aabf37131a14b178eee76a5320e3d428f851c54da629e303396ad6542e735870368187b189411ae2e00f1004b48df76a565cfad2f1f1434bede444
+  metadata.gz: fcb3e3a26693625c437dafbfb38520a8db2aa7b4a4d9fc29804706e728e62c585a2c4aaaa3fabac1e081a9acbca4346a516148c95f28716400ba44ef53dc6136
+  data.tar.gz: 5f5f20d3dd0f582910a6e48bb1ec2c9b23da5ec7b8a72fcdd4c8338c6a8ea07ef60f442f41f22bd8587e4d0a0027758bb65ecfcefedb107a89e16e8abd2f65be

data/lib/kubernetes_helper/version.rb

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

data/lib/templates/_container_extra_settings.yml

@@ -0,0 +1,9 @@
+#              <% if locals[:pod] == 'job' %>
+#              resources:
+#                requests:
+#                  cpu: 50m
+#                  memory: 256Mi
+#                limits:
+#                  cpu: 500m
+#                  memory: 1Gi
+#              <% end %>

data/lib/templates/_custom_containers.yml

@@ -0,0 +1,5 @@
+#            <% if locals[:pod] == 'job' %>
+#            - name: scraper
+#              image: owencio/easy_scraper
+#              ...
+#            <% end %>

data/lib/templates/_job_liveness.yml

@@ -0,0 +1,12 @@
+              ports: [ ]
+              <% if (deployment.job_services || []).any? %>
+              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
+                               echo "Some required services are not running"; exit 1;
+                           fi' ]
+                initialDelaySeconds: 120
+                periodSeconds: 30
+              readinessProbe: *liveness_probe
+              <% end %>

data/lib/templates/deployment.yml

@@ -42,6 +42,7 @@ documents:
                 periodSeconds: 15
               readinessProbe: *liveness_probe
               <% end %>
+              <%= include_template "_container_extra_settings.yml", { pod: 'web' } %>
 
               volumeMounts:
                 - &log_volume
@@ -70,6 +71,7 @@ documents:
               env: []
               volumeMounts:
                 - *cloud_credentials_volume
+              <%= include_template "_container_extra_settings.yml", { pod: 'cloudsql' } %>
             <% end %>
 
             - &logs_container # print to stdout all log files
@@ -79,6 +81,7 @@ documents:
               env: []
               volumeMounts:
                 - *log_volume
+              <%= include_template "_container_extra_settings.yml", { pod: 'logs' } %>
 
             <%= include_template "_custom_containers.yml", { pod: 'web' } %>
 
@@ -127,22 +130,12 @@ documents:
               <% if deployment.job_command %>
               command: [ "/bin/bash", "-c", "<%= deployment.job_command %>" ]
               <% end %>
+              <%= include_template "_container_extra_settings.yml", { pod: 'job' } %>
 
             <% if deployment.job_sidekiq_alive_gem %>
               <%= include_template "_sidekiq_alive_gem.yml" %>
             <% else %>
-              ports: [ ]
-              <% if (deployment.job_services || []).any? %>
-              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
-                           echo "Some required services are not running"; exit 1;
-                       fi' ]
-                initialDelaySeconds: 120
-                periodSeconds: 30
-              readinessProbe: *liveness_probe
-              <% end %>
+              <%= include_template "_job_liveness.yml" %>
             <% end %>
 
             <% if deployment.cloud_secret_name %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes_helper
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - owen2345
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -41,7 +41,9 @@ files:
 - lib/kubernetes_helper/version.rb
 - lib/templates/README.md
 - lib/templates/_cd_apply_images.sh
+- lib/templates/_container_extra_settings.yml
 - lib/templates/_custom_containers.yml
+- lib/templates/_job_liveness.yml
 - lib/templates/_replicas.yml
 - lib/templates/_sidekiq_alive_gem.yml
 - lib/templates/cd.sh