pfab 0.29.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9391bfdc2ed0ea0d34e42751b2e3cbac308c5f68df6d3c809cd968a5d550b8
-  data.tar.gz: 20cad91ed093ebcf575fdc9223152156f8fe6ac0be070e973ff1e049679df37f
+  metadata.gz: 9b3ff2aa05ecd491a414c3884cb2d04ef92ad791c4bb8ecfa12eacd3d796b3f0
+  data.tar.gz: e1e21b111755fc25cd97aed82be2fa22dd25bde10434b4b33e4bcc61f4a85928
 SHA512:
-  metadata.gz: 52f8ab8793e8197916a437e83ef57e2d8a141c3bf6e043ad3843422592e4b294c5be40237f57697a05e55c4259ea9ebfc20474f636f3ef956e401f53b69e6e01
-  data.tar.gz: 8e3c8ae0fc94fde7715f34cf2f26bac8faa04ac8116f378d2509eb3f4aefd38d55bc5cdbc3e7c808602436fd81724cbd909f410c11914bdf9deacf58c3750e7e
+  metadata.gz: e93309c3947e2a17a7d3b5f597eb2ef4d277230d667bc8e211d4f69e6c2f695a297bce145f937757e7a9658a7cc67c794d1303aadcf65558161f8129eecf6dfa
+  data.tar.gz: a462014934cc780e032409b55004ad4104659c3aeac9731d45f64bd7dbd823ad85f2c08d92719493380d5b92aa0c17ee76a4e41242ad5a717c098a73bed16e64

data/lib/pfab/templates/base.rb

@@ -17,6 +17,10 @@ module Pfab
         app_vars.dig(@data["env"], key) || app_vars[key]
       end
 
+      def get_namespace()
+        get("namespace") || @data['env']
+      end
+
       def cpu(req_type)
         default_cpu_string = @data["config"]["default_cpu_string"] || "50m/250m"
         (request, limit) = (get("cpu") || default_cpu_string).split("/")
@@ -82,9 +86,9 @@ module Pfab
               fieldRef: { fieldPath: field_name }
             } }
           elsif v.to_s.start_with? "configmap/"
-             (_, configMapName, keyName) = v.split("/")
+             (_, configmap_name, key_name) = v.split("/")
              env_vars[env_var_name] = { valueFrom: {
-               configMapKeyRef: { name: configMapName, key: keyName }
+               configMapKeyRef: { name: configmap_name, key: key_name }
              } }
           else
             env_vars[env_var_name] = { value: v }

data/lib/pfab/templates/cron.rb

@@ -15,7 +15,7 @@ module Pfab
           kind: "CronJob",
           metadata: {
             name: "#{@data['deployed_name']}-#{@data['sha']}",
-            namespace: @data['env'],
+            namespace: get_namespace,
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
@@ -53,7 +53,7 @@ module Pfab
                     },
                   },
                   spec: {
-
+                    serviceAccountName: get('serviceAccountName'),
                     containers: [
                       {
                         image: image_name,
@@ -64,7 +64,7 @@ module Pfab
                       },
                     ],
                     restartPolicy: "Never",
-                  },
+                  }.compact,
                 },
                 backoffLimit: 2,
               },

data/lib/pfab/templates/daemon.rb

@@ -15,7 +15,7 @@ module Pfab
           apiVersion: "apps/v1",
           metadata: {
             name: @data['deployed_name'],
-            namespace: @data['env'],
+            namespace: get_namespace,
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
@@ -28,6 +28,7 @@ module Pfab
           },
           spec: {
             replicas: get("replicas") || 1,
+            serviceAccountName: get('serviceAccountName'),
             selector: {
               matchLabels: {
                 "deployed-name" => @data['deployed_name'],
@@ -60,7 +61,7 @@ module Pfab
                 ]
               },
             },
-          },
+          }.compact,
         }
       end
     end

data/lib/pfab/templates/job.rb

@@ -15,7 +15,7 @@ module Pfab
           kind: "Job",
           metadata: {
             name: "job-#{@data['deployed_name']}-#{@data['sha']}",
-            namespace: @data['env'],
+            namespace: get_namespace,
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
@@ -30,7 +30,7 @@ module Pfab
             template: {
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",
-                namespace: @data['env'],
+                namespace: get_namespace,
                 labels: {
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
@@ -41,6 +41,7 @@ module Pfab
                 },
               },
               spec: {
+                serviceAccountName: get('serviceAccountName'),
                 containers: [
                   {
                     image: image_name,
@@ -51,7 +52,7 @@ module Pfab
                   },
                 ],
                 restartPolicy: "Never",
-              },
+              }.compact,
             },
             backoffLimit: 0,
           },

data/lib/pfab/templates/web.rb

@@ -6,7 +6,11 @@ module Pfab
           puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
         else
           f << YAML.dump(service.deep_stringify_keys)
-          f << YAML.dump(ingress.deep_stringify_keys)
+          if not app_vars.has_key?('generateIngressEnabled') || app_vars['generateIngressEnabled']
+            f << YAML.dump(ingress.deep_stringify_keys)
+          else
+            puts "skipping ingress because ingress_disabled = #{@data['generateIngressEnabled']}"
+          end
           f << YAML.dump(deployment.deep_stringify_keys)
         end
       end
@@ -17,7 +21,7 @@ module Pfab
           kind: "Service",
           metadata: {
             name: @data['deployed_name'],
-            namespace: @data['env'],
+            namespace: get_namespace,
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
@@ -32,8 +36,9 @@ module Pfab
               {
                 name: "http",
                 port: 80,
-                targetPort: get("port"),
-              }
+                targetPort: app_vars["port"],
+                appProtocol: app_vars["appProtocol"]
+              }.compact
             ]
           }
         }
@@ -51,7 +56,7 @@ module Pfab
           kind: "Ingress",
           metadata: {
             name: "ingress-#{@data['deployed_name']}",
-            namespace: @data['env'],
+            namespace: get_namespace,
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
@@ -136,17 +141,52 @@ module Pfab
         get("readinessProbe") || default_probe
       end
 
+      def startupProbe
+        get("startupProbe") || default_probe
+      end
+
       def application_type
         "web"
       end
 
       def deployment
+        secret_mounts = get("secretMounts") || []
+        volume_mounts = []
+        volumes = []
+        secret_mounts.each do |secret_mount|
+          volumes.append({
+                           name: secret_mount['name'],
+                           secret: { secretName: secret_mount['secretName'] }
+                         })
+          volume_mounts.append({
+                                 name: secret_mount['name'],
+                                 mountPath: secret_mount['path'],
+                                 readOnly: secret_mount['readOnly'] || true
+                               })
+        end
+
+        if get("datadogVolumeMountEnabled")
+          datadog_volume_name = "ddsocket"
+          datadog_path = "/var/run/datadog"
+          volumes.append({
+                           name: datadog_volume_name,
+                           hostPath: {
+                            path: datadog_path
+                           }
+                         })
+          volume_mounts.append(
+            name: datadog_volume_name,
+            mountPath: datadog_path,
+            readOnly: true
+          )
+        end
+
         {
           kind: "Deployment",
           apiVersion: "apps/v1",
           metadata: {
             name: @data['deployed_name'],
-            namespace: @data['env'],
+            namespace: get_namespace,
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
@@ -185,6 +225,7 @@ module Pfab
                 },
               },
               spec: {
+                serviceAccountName: get('serviceAccountName'),
                 containers: [
                   {
                     image: image_name,
@@ -192,27 +233,26 @@ module Pfab
                     command: get("command").split(" "),
                     env: env_vars,
                     resources: resources,
-                    livenessProbe: livenessProbe,
-                    readinessProbe: readinessProbe,
-                    volumeMounts: [
+                    ports: [
                       {
-                        name: "apmsocketpath",
-                        mountPath: "/var/run/datadog"
+                        name: "main",
+                        containerPort: app_vars["port"]
+                      },
+                      {
+                        name: "health-port",
+                        containerPort: 8085 # the default micronaut endpoint port
                       }
-                    ]
-                  }
-                ],
-                volumes: [
-                  {
-                    name: "apmsocketpath",
-                    hostPath: {
-                      path: "/var/run/datadog/",
-                    }
+                    ],
+                    livenessProbe: livenessProbe,
+                    readinessProbe: readinessProbe,
+                    startupProbe: startupProbe,
+                    volumeMounts: volume_mounts
                   }
                 ],
-              },
+                volumes: volumes
+              }.compact,
             },
-          },
+          }.compact,
         }
       end
     end

data/lib/pfab/version.rb

@@ -1,7 +1,7 @@
 module Pfab
   module Version
     MAJOR = 0
-    MINOR = 29
+    MINOR = 30
     PATCH = 0
     BUILD = nil
 

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.29.0 ruby lib
+# stub: pfab 0.30.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.29.0"
+  s.version = "0.30.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2023-02-07"
+  s.date = "2023-02-17"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -44,31 +44,22 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.0.3.1".freeze
+  s.rubygems_version = "3.2.32".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<commander>.freeze, [">= 0"])
-      s.add_dependency(%q<activesupport>.freeze, [">= 0"])
-      s.add_dependency(%q<pry-byebug>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<commander>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<pry-byebug>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.4.9"])
+    s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_development_dependency(%q<test-unit>.freeze, [">= 0"])
   else
     s.add_dependency(%q<commander>.freeze, [">= 0"])
     s.add_dependency(%q<activesupport>.freeze, [">= 0"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: helper gem