pfab 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b392f68991b49afc22318422f4dd4f96d13bc52ca8a396d7729ada18bc11a3e2
-  data.tar.gz: 5416eed2bb10024a301aa333af5e5a1461c17ecc9eb04d56ada122ab30941a1f
+  metadata.gz: ae7b00c6d13d8b45b8366942aff2a3afacc421e798a715bde6acb2455623a1b2
+  data.tar.gz: c94e58d362a8c6f3f6da51dd183b32da9474278eb6aaaf8e8ba2d35c2aab346e
 SHA512:
-  metadata.gz: f0db29c46509ac77be55327ecc361690c1d7cf8b31f9c7370ee8ff3c7320f773ad74dada73228dea9ded028deefa0d51dc5d233ee83bc8046f90b636fcdf1116
-  data.tar.gz: 3434c7ae8d1f54fa8e42460aef66b86c65d63647af1740ff6ff86b8e90024e132b4acda418598d71aa4462f9e915ee9f05147fafa50b2efcc8da73f4de86646c
+  metadata.gz: '092d1680e87f567c670d566dcebaa029a4c2b30fd841695a4d0bd6a2da0b542f8aa5f41208e70116c374a90a359276f2df0a4bdac511ec28c490ac4ac040538a'
+  data.tar.gz: ef414f2881c18685adef089dfdfd0a61937941ff3945338b74d3025f1f48a77203ca5545df80fa8fdb4bb4f0a2ca9722929c0a3ae780f770d9cb83ee418abd9a

data/Gemfile.lock

@@ -18,7 +18,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -30,7 +30,7 @@ GEM
     coderay (1.1.2)
     commander (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.3.1)
@@ -53,7 +53,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    git (1.11.0)
+    git (1.9.1)
       rchardet (~> 1.8)
     github_api (0.19.0)
       addressable (~> 2.4)
@@ -63,19 +63,19 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.6.0)
     highline (1.7.10)
-    i18n (1.8.11)
+    i18n (1.2.0)
       concurrent-ruby (~> 1.0)
     json (1.8.6)
     jwt (2.3.0)
     kamelcase (0.0.2)
       semver2 (~> 3)
     method_source (0.9.2)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    mini_portile2 (2.8.1)
+    minitest (5.11.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.6)
+    nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oauth2 (1.4.7)
@@ -93,7 +93,7 @@ GEM
       pry (~> 0.10)
     psych (4.0.2)
     public_suffix (4.0.6)
-    racc (1.6.0)
+    racc (1.6.2)
     rack (2.2.3)
     rake (13.0.6)
     rchardet (1.8.0)
@@ -109,7 +109,7 @@ GEM
     test-unit (3.2.9)
       power_assert
     thread_safe (0.3.6)
-    tzinfo (1.2.9)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -126,4 +126,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.3.5
+   1.17.2

data/README.markdown

@@ -117,9 +117,9 @@ Releasing
 - modify version.rb
 - ```bundle exec rake gemspec```
 - ```git commit ```
-- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake git:release```
-- ```REMOTE_BRANCH=main LOCAL_BRANCH=main bundle exec rake build```
-- ```gem push pkg/pfab-0.15.0.gem```
+- ```bundle exec rake git:release```
+- ```bundle exec rake build```
+- ```gem push pkg/pfab-0.12.0.gem```
 
 Copyright
 ---------

data/lib/pfab/cli.rb

@@ -22,14 +22,7 @@ module Pfab
       $dryrun = false
       global_option("--dryrun") { $dryrun = true }
       $env = :staging
-      global_option("-p") do
-        puts "please use `-e production` next time!"
-        $env = :production
-      end
-      global_option("-e", "--environment ENV", "specify target env") do |env_name|
-        puts "Using environment #{env_name}"
-        $env = env_name
-      end
+      global_option("-p") { $env = :production }
       global_option("-a", "--application_name APP_NAME", "run without prompting for app") do |app_name|
         $app_name = app_name
       end
@@ -38,9 +31,8 @@ module Pfab
         c.syntax = "pfab build"
         c.summary = "build image"
         c.option "--force", "force build and push"
-        c.option "--check", "just check if built"
         c.action do |_args, options|
-          cmd_build(force: options.force, checkonly: options.check)
+          cmd_build(force: options.force)
         end
       end
 
@@ -91,18 +83,6 @@ module Pfab
         end
       end
 
-      command :restart do |c|
-        c.syntax = "pfab restart"
-        c.summary = "rolling restart of a deployment"
-        c.description = "rolling restart of a deployment"
-        c.action do
-          set_kube_context
-          app_name = get_app_name
-
-          puts_and_system "kubectl rollout restart deployment.apps/#{app_name}"
-        end
-      end
-
       command :exec do |c|
         c.syntax = "pfab exec"
         c.summary = "kubectl exec into a  pod"
@@ -210,20 +190,10 @@ module Pfab
         end
         puts_and_system("kubectl apply -f .application-k8s-#{$env}-#{app_name}.yaml")
         puts_and_system("git tag release-#{$env}-#{app_name}-#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")} HEAD")
-        puts_and_system("git push origin --tags")
       end
     end
 
-    def image_exists?(full_image_name)
-
-      # return 0 if image exists 1 if not
-      cmd = "docker manifest inspect #{full_image_name} > /dev/null ; echo $?"
-      say "Looking for images with #{cmd}"
-      existing = `#{cmd}`.strip
-      existing == "0"
-    end
-
-    def cmd_build(force: false, checkonly: false)
+    def cmd_build(force: false)
       rev = get_current_sha
       say "This repo is at rev: #{rev}"
       uncommitted_changes = !`git diff-index HEAD --`.empty?
@@ -239,14 +209,13 @@ module Pfab
 
       full_image_name = "#{container_repository}/#{image_name}:#{rev}"
 
-      unless force
-        if image_exists?(full_image_name)
-          say "Found image #{full_image_name} already, skipping prebuild, build & push"
-          return true
-        else
-          say "No image #{full_image_name} present"
-        end
-        return if checkonly
+      cmd = "docker images -q #{full_image_name}"
+      say "Looking for images with #{cmd}"
+      existing = `#{cmd}`
+
+      if !existing.to_s.empty? && !force
+        say "Found image #{full_image_name} already, skipping prebuild, build & push"
+        return true
       end
 
       say "No image #{full_image_name} present, building"
@@ -265,23 +234,13 @@ module Pfab
         end
       end
 
-      build_cmd = "docker build -t #{image_name} --platform amd64 ."
-      puts build_cmd
-      result = system(build_cmd)
+      puts_and_system "docker build -t #{image_name} --platform amd64 ."
 
-      puts "Build Result #{result}"
-
-      if result
-        puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
-        puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
-
-        puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
-        return true
-      else
-        say "Build Did Not Succeed"
-        return false
-      end
+      puts_and_system "docker tag #{image_name}:latest #{image_name}:#{rev}"
+      puts_and_system "docker tag #{image_name}:#{rev} #{full_image_name}"
 
+      puts_and_system "docker push #{container_repository}/#{image_name}:#{rev}"
+      return true
     end
 
     def yy
@@ -304,7 +263,7 @@ module Pfab
     end
 
     def get_current_sha
-      `git rev-parse --short=8 --verify HEAD`.chomp
+      `git rev-parse --short --verify HEAD`.chomp
     end
 
     def set_kube_context

data/lib/pfab/templates/base.rb

@@ -17,10 +17,6 @@ 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("/")
@@ -46,24 +42,8 @@ module Pfab
         }
       end
 
-      # overridden in subtypes
-      def application_type
-        "base"
-      end
-
-      def deploy_id
-        "#{@data['application']}.#{application_type}.#{@data['deployed_name']}"
-      end
-
       def env_vars
-        env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] },
-                     "DEPLOY_ID" => { value: deploy_id },
-                     "POD_ID" => { valueFrom: { fieldRef: { fieldPath: 'metadata.name' } } },
-                     "SPEC_NODENAME" => { valueFrom: { fieldRef: { fieldPath: 'spec.nodeName' } } },
-                     "DD_ENV" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/env']" } } },
-                     "DD_SERVICE" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/service']" } } },
-                     "DD_VERSION" => { valueFrom: { fieldRef: { fieldPath: "metadata.labels['tags.datadoghq.com/version']" } } }
-        }
+        env_vars = { "DEPLOYED_NAME" => { value: @data['deployed_name'] } }
 
         # load defaults
         load_env_vars(env_vars, @data.dig("application_yaml", :environment))
@@ -85,11 +65,6 @@ module Pfab
             env_vars[env_var_name] = { valueFrom: {
               fieldRef: { fieldPath: field_name }
             } }
-          elsif v.to_s.start_with? "configmap/"
-             (_, configmap_name, key_name) = v.split("/")
-             env_vars[env_var_name] = { valueFrom: {
-               configMapKeyRef: { name: configmap_name, key: key_name }
-             } }
           else
             env_vars[env_var_name] = { value: v }
           end

data/lib/pfab/templates/cron.rb

@@ -5,25 +5,17 @@ module Pfab
         f << YAML.dump(job.deep_stringify_keys)
       end
 
-      def application_type
-        "cron"
-      end
-
       def job
         {
-          apiVersion: "batch/v1",
+          apiVersion: "batch/v1beta1",
           kind: "CronJob",
           metadata: {
             name: "#{@data['deployed_name']}-#{@data['sha']}",
-            namespace: get_namespace,
+            namespace: @data['env'],
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version": "#{@data['sha']}"
+              "application-type" => "job",
             }
           },
           spec: {
@@ -47,13 +39,10 @@ module Pfab
                       application: @data['application'],
                       "deployed-name" => @data['deployed_name'],
                       "application-type" => "cron",
-                      "tags.datadoghq.com/env": @data['env'],
-                      "tags.datadoghq.com/service": @data['deployed_name'],
-                      "tags.datadoghq.com/version": "#{@data['sha']}"
                     },
                   },
                   spec: {
-                    serviceAccountName: get('serviceAccountName'),
+
                     containers: [
                       {
                         image: image_name,
@@ -64,7 +53,7 @@ module Pfab
                       },
                     ],
                     restartPolicy: "Never",
-                  }.compact,
+                  },
                 },
                 backoffLimit: 2,
               },

data/lib/pfab/templates/daemon.rb

@@ -5,25 +5,17 @@ module Pfab
         f << YAML.dump(deployment.deep_stringify_keys)
       end
 
-      def application_type
-        "daemon"
-      end
-
       def deployment
         {
           kind: "Deployment",
           apiVersion: "apps/v1",
           metadata: {
             name: @data['deployed_name'],
-            namespace: get_namespace,
+            namespace: @data['env'],
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "application-type" => "daemon",
             }
           },
           spec: {
@@ -43,13 +35,9 @@ module Pfab
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
                   "application-type" => "daemon",
-                  "tags.datadoghq.com/env": @data['env'],
-                  "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
                 },
               },
               spec: {
-                serviceAccountName: get('serviceAccountName'),
                 containers: [
                   {
                     image: image_name,
@@ -59,9 +47,9 @@ module Pfab
                     resources: resources,
                   }
                 ]
-              }.compact,
+              },
             },
-          }.compact,
+          },
         }
       end
     end

data/lib/pfab/templates/job.rb

@@ -5,43 +5,31 @@ module Pfab
         f << YAML.dump(job.deep_stringify_keys)
       end
 
-      def application_type
-        "job"
-      end
-
       def job
         {
           apiVersion: "batch/v1",
           kind: "Job",
           metadata: {
             name: "job-#{@data['deployed_name']}-#{@data['sha']}",
-            namespace: get_namespace,
+            namespace: @data['env'],
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "application-type" => "job",
             }
           },
           spec: {
             template: {
               metadata: {
                 name: "#{@data['deployed_name']}-#{@data['sha']}",
-                namespace: get_namespace,
+                namespace: @data['env'],
                 labels: {
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
                   "application-type" => "job",
-                  "tags.datadoghq.com/env": @data['env'],
-                  "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
                 },
               },
               spec: {
-                serviceAccountName: get('serviceAccountName'),
                 containers: [
                   {
                     image: image_name,
@@ -52,7 +40,7 @@ module Pfab
                   },
                 ],
                 restartPolicy: "Never",
-              }.compact,
+              },
             },
             backoffLimit: 0,
           },

data/lib/pfab/templates/web.rb

@@ -6,11 +6,7 @@ module Pfab
           puts "No host to deploy to for #{@data['deployed_name']}. Skipping."
         else
           f << YAML.dump(service.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(ingress.deep_stringify_keys)
           f << YAML.dump(deployment.deep_stringify_keys)
         end
       end
@@ -21,12 +17,11 @@ module Pfab
           kind: "Service",
           metadata: {
             name: @data['deployed_name'],
-            namespace: get_namespace,
+            namespace: @data['env'],
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-            },
-            annotations: service_annotations,
+            }
           },
           spec: {
             selector: {
@@ -36,27 +31,20 @@ module Pfab
               {
                 name: "http",
                 port: 80,
-                targetPort: app_vars["port"],
-                appProtocol: app_vars["appProtocol"]
-              }.compact
+                targetPort: get("port"),
+              }
             ]
           }
         }
       end
 
-      def service_annotations
-        h = {}
-        h["traefik.ingress.kubernetes.io/service.serversscheme"] = "h2c" if get("protocol") == "h2c"
-        h
-      end
-
       def ingress
         {
           apiVersion: "networking.k8s.io/v1",
           kind: "Ingress",
           metadata: {
             name: "ingress-#{@data['deployed_name']}",
-            namespace: get_namespace,
+            namespace: @data['env'],
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
@@ -119,6 +107,7 @@ module Pfab
           "traefik.ingress.kubernetes.io/router.entrypoints" => "websecure",
           "traefik.ingress.kubernetes.io/router.tls" => "true"
         }
+        h["ingress.kubernetes.io/protocol"] = "h2c" if get("protocol") == "h2c"
         h
       end
 
@@ -141,60 +130,17 @@ 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: get_namespace,
+            namespace: @data['env'],
             labels: {
               application: @data['application'],
               "deployed-name" => @data['deployed_name'],
-              "application-type" => application_type,
-              "deploy-id" => deploy_id,
-              "tags.datadoghq.com/env": @data['env'],
-              "tags.datadoghq.com/service": @data['deployed_name'],
-              "tags.datadoghq.com/version":"#{@data['sha']}"
+              "application-type" => "web",
             }
           },
           spec: {
@@ -219,13 +165,9 @@ module Pfab
                   application: @data['application'],
                   "deployed-name" => @data['deployed_name'],
                   "application-type" => "web",
-                  "tags.datadoghq.com/env": @data['env'],
-                  "tags.datadoghq.com/service": @data['deployed_name'],
-                  "tags.datadoghq.com/version": "#{@data['sha']}"
                 },
               },
               spec: {
-                serviceAccountName: get('serviceAccountName'),
                 containers: [
                   {
                     image: image_name,
@@ -233,26 +175,13 @@ module Pfab
                     command: get("command").split(" "),
                     env: env_vars,
                     resources: resources,
-                    ports: [
-                      {
-                        name: "main",
-                        containerPort: app_vars["port"]
-                      },
-                      {
-                        name: "health-port",
-                        containerPort: 8085 # the default micronaut endpoint port
-                      }
-                    ],
                     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 = 32
+    MINOR = 33
     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.30.0 ruby lib
+# stub: pfab 0.33.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.30.0"
+  s.version = "0.33.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-17"
+  s.date = "2023-02-21"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".tool-versions",
-    "CODEOWNERS",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -44,7 +43,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/prefab-cloud/pfab".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.2.32".freeze
+  s.rubygems_version = "3.3.7".freeze
   s.summary = "helper gem".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Jeff Dwyer
@@ -133,7 +133,6 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".tool-versions"
-- CODEOWNERS
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt

data/CODEOWNERS

@@ -1 +0,0 @@
-*    @prefab-cloud/prefabdevs @prefab-cloud/prefabmaintainers @prefab-cloud/prefabadmins