seira 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3217d5194a295fc619a76aeee458e668f8c6098
-  data.tar.gz: 171b4d7b51e17fc15829e398a1236e11e2d6d556
+  metadata.gz: c5be00c536176932142946b6895318dc29d53f76
+  data.tar.gz: 2a902ea955ee77f72c174de8672d15def2eef544
 SHA512:
-  metadata.gz: b8d3ad1639cdf424c7b60ea3000cdddf09baa02a90d716be94d2fab6530f27bcf60ca712aa6db22a1ea9e252336294f34ba89a4967ed8022b0b77849205fa554
-  data.tar.gz: 36e28341f6a5b493374f926b36903fce10977e48ec19c43318bcf1ee7c56714eca63254603337cc19a4d4bcd40fa5d4cab6c634af82940cdb7870338e890135f
+  metadata.gz: fb4e57972ea5e115b7daa89105662789e74aa9c80bd51a36cd5454331bc88d873610fb532a3e1a528dc2bc7577ad5b47b95b0969006459b06145aa89e480e475
+  data.tar.gz: ecaa4df24618206589985f0e06641243173d0ccef6b11934651f928f10f686b0a3fa8ffad35dd42ff71f6d946c73fea07057c0c861b541b6e77586f4d665e31e

data/.gitignore

@@ -10,3 +10,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+# don't commit app-specific config
+.seira.yml

data/README.md

@@ -1,7 +1,16 @@
 # Seira
+
+[![Gem Version](https://badge.fury.io/rb/seira.svg)](https://badge.fury.io/rb/seira)
+[![Build Status](https://travis-ci.org/joinhandshake/seira.svg?branch=master)](https://travis-ci.org/joinhandshake/seira)
+
 An opinionated library for building applications on Kubernetes.
 
+This library builds a framework for doing deployments, secrets management, managing memcached, managing redis, managing and accessing pods, bootstraping new apps and clusters, and more. It makes decisions about how to run the apps and cluster to make managing the cluster easier.
+
+The vision for Seira is to produce a CLI and set of guidelines that makes deploying apps on Kubernetes as easy as Heroku.
+
 ## What does the name mean?
+
 Following Kubernetes naming pattern, Seira (Seirá) is greek for "order" or "the state of being well arranged".
 
 ## Installation
@@ -20,9 +29,95 @@ Or install it yourself as:
 
     $ gem install seira
 
+The `gem install seira` option may be preferred for shorter typing, or generating a binstub is also an option.
+
 ## Usage
 
-TODO: Write usage instructions here
+This library only currently works with `gcloud` and `kubectl`, meaning Google Container Engine and Kubernetes.
+
+All commands follow a pattern:
+
+`seira <cluster> <app> <category> <param1> <param2> <..>`
+
+The only exception is commands on the cluster itself, which does not take an `<app>`. By making sure to take in a cluster as the first parameter to every command, the intent is to reduce mistake commands on the wrong cluster.
+
+### Configuration File
+
+A configuration file is expected at `.seira.yml` relative path. Below is an example file.
+
+```
+seira:
+  organization_id: "11111"
+  default_zone: "us-central1-a"
+  clusters:
+    internal:
+      project: org-internal
+      cluster: gke_org-internal_us-central1-a_internal
+      aliases:
+        - "i"
+    staging:
+      project: org-staging
+      cluster: gke_org-staging_us-central1-a_staging
+      aliases:
+        - "s"
+    demo:
+      project: org-demo
+      cluster: gke_org-demo_us-central1-a_demo
+      aliases:
+        - "d"
+    production:
+      project: org-production
+      cluster: gke_org-production_us-central1-a_production
+      aliases:
+        - "p"
+  valid_apps:
+    - app1
+    - app2
+```
+
+This specification is read in and used to determine what `gcloud` context to use and what `kubectl` cluster to use when operating commands. For example, `seira internal` will connect to `org-internal` gcloud configuration and `gke_org-internal_us-central1-a_internal` kubectl cluster. For shorthand, `seira i` shorthand is specified as an alias.
+
+### Manifest Files
+
+Seira expects your Kubernetes manifests to exist in the "kubernetes/<cluster>/<app>" directory. When a deploy is run on `foo` app in `staging` cluster, it looks to `kubernetes/staging/foo` directory for the manifest files.
+
+### Assumptions
+
+- Each app has all its objects contained in a namespace, named after the app
+- Each app has one or more deployments, and a deployment and all pods created by that deployment have a `tier` label matching the name of the deployment
+- If using a SQL database (currently only postgresql is supported), pgbouncer is used for connection pooling, and the app uses the secret `DATABASE_URL` to connect and authenticate to the database
+
+### Initial Setup
+
+In order to use Seira, an initial setup is needed. Use the `seira setup` command to set up each of your clusters in your configuration file.
+
+## Example functionality
+
+### Running Proxy UI
+
+Easily run a proxy UI (`kubectl proxy`) by using `seira staging proxy` shorthand.
+
+### Applying New Manifest Files
+
+By using `seira staging app-name app apply`, Seira will find/replace the string "REVISION" in your manifests with the value in the `REVISION` environment variable and apply the new configs to the cluster. If `REVISION` is nil, it will ask to use the tag currently being used by the current `web` deployment.
+
+### Setting Secrets
+
+All secrets are stored in `appname-secrets` Secret object. They are expected to be used via `envFrom` in manifest files.
+
+`seira staging app-name secrets list`
+
+`seira staging app-name secrets set KEY=value`
+
+`seira staging app-name secrets get KEY`
+
+### Pods
+
+Pods can be listed and also exec'd into.
+
+`seira staging app-name pods list`
+
+`seira staging app-name pods run`
 
 ## Development
 
@@ -32,7 +127,21 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sgringwe/seira.
+Bug reports and pull requests are welcome on GitHub at https://github.com/joinhandshake/seira.
+
+## Roadmap
+
+Future roadmap has plans for:
+
+- Create CLI help commands and improve general CLI usability
+- Cloud SQL Postgres Management (credentials, processes, diagnostics, psql, etc)
+- Smooth application restarts, including such as after changing secrets
+- Better redis and memcached production-level management
+- More functionality for managing pods
+- Maintenance page mode
+- Quickly scaling up/down deployments
+- SSL Certificate inspection and observability through kube-lego
+- More seamless `seira setup` script
 
 
 ## License

data/lib/seira.rb

@@ -8,6 +8,7 @@ require 'seira/memcached'
 require 'seira/pods'
 require 'seira/proxy'
 require 'seira/random'
+require 'seira/db'
 require 'seira/redis'
 require 'seira/secrets'
 require 'seira/settings'
@@ -20,6 +21,7 @@ module Seira
     CATEGORIES = {
       'secrets' => Seira::Secrets,
       'pods' => Seira::Pods,
+      'db' => Seira::Db,
       'redis' => Seira::Redis,
       'memcached' => Seira::Memcached,
       'app' => Seira::App,
@@ -98,7 +100,7 @@ module Seira
     end
 
     def base_validations
-      # The first arg must always be the cluster. This ensures commands are not run by 
+      # The first arg must always be the cluster. This ensures commands are not run by
       # accident on the wrong kubernetes cluster or gcloud project.
       exit(1) unless Seira::Cluster.new(action: nil, args: nil, context: nil, settings: settings).switch(target_cluster: cluster, verbose: false)
       exit(0) if simple_cluster_change?
@@ -122,4 +124,4 @@ module Seira
       app.nil? && category.nil? # Special case where user is simply changing environments
     end
   end
-end
+end

data/lib/seira/app.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 # seira staging specs app bootstrap
 module Seira
   class App
-    VALID_ACTIONS = %w[bootstrap apply upgrade restart].freeze
+    VALID_ACTIONS = %w[bootstrap apply upgrade restart scale].freeze
 
     attr_reader :app, :action, :args, :context
 
@@ -27,6 +27,8 @@ module Seira
         run_upgrade
       when 'restart'
         run_restart
+      when 'scale'
+        run_scale
       else
         fail "Unknown command encountered"
       end
@@ -57,7 +59,7 @@ module Seira
         exit(1) unless HighLine.agree("No REVISION specified. Use current deployment revision '#{current_revision}'?")
         revision = current_revision
       end
-      
+
       replacement_hash = { 'REVISION' => revision }
 
       replacement_hash.each do |k, v|
@@ -76,12 +78,36 @@ module Seira
       system("kubectl apply -f #{destination}")
     end
 
+    def run_scale
+      scales = key_value_map.dup
+      configs = load_configs
+
+      if scales.key? 'all'
+        configs.each do |config|
+          next unless config['kind'] == 'Deployment'
+          scales[config['metadata']['labels']['tier']] ||= scales['all']
+        end
+        scales.delete 'all'
+      end
+
+      scales.each do |tier, replicas|
+        config = configs.find { |c| c['kind'] == 'Deployment' && c['metadata']['labels']['tier'] == tier }
+        if config.nil?
+          puts "Warning: could not find config for tier #{tier}"
+          next
+        end
+        replicas = config['spec']['replicas'] if replicas == 'default'
+        puts "scaling #{tier} to #{replicas}"
+        system("kubectl scale --namespace=#{app} --replicas=#{replicas} deployments/#{config['metadata']['name']}")
+      end
+    end
+
     def bootstrap_main_secret
       puts "Creating main secret and namespace..."
       main_secret_name = Seira::Secrets.new(app: app, action: action, args: args, context: context).main_secret_name
 
       # 'internal' is a unique cluster/project "cluster". It always means production in terms of rails app.
-      rails_env = 
+      rails_env =
         if context[:cluster] == 'internal'
           'production'
         else
@@ -109,22 +135,38 @@ module Seira
       puts "Copying source yaml from #{source} to #{destination}"
       FileUtils::mkdir_p destination # Create the nested directory
       FileUtils.copy_entry source, destination
-    
+
       # Iterate through each yaml file and find/replace and save
       puts "Iterating #{destination} files find/replace revision information"
       Dir.foreach(destination) do |item|
         next if item == '.' || item == '..'
-  
+
         text = File.read("#{destination}/#{item}")
-    
+
         new_contents = text
         replacement_hash.each do |key, value|
           new_contents.gsub!(key, value)
         end
-    
+
         # To write changes to the file, use:
         File.open("#{destination}/#{item}", 'w') { |file| file.write(new_contents) }
       end
     end
+
+    # TODO(josh): factor out and share this method with similar commands (e.g. `secrets set`)
+    def key_value_map
+      args.map do |arg|
+        equals_index = arg.index('=')
+        [arg[0..equals_index - 1], arg[equals_index + 1..-1]]
+      end.to_h
+    end
+
+    def load_configs
+      directory = "kubernetes/#{context[:cluster]}/#{app}/"
+      Dir.new(directory).flat_map do |filename|
+        next if ['.', '..'].include? filename
+        YAML.load_stream(File.read(File.join(directory, filename)))
+      end.compact
+    end
   end
 end

data/lib/seira/cluster.rb

@@ -55,7 +55,7 @@ module Seira
     private
 
     # Intended for use when spinning up a whole new cluster. It stores two main secrets
-    # in the default space that are intended to be copied into individual namespaces when 
+    # in the default space that are intended to be copied into individual namespaces when
     # new apps are built.
     def run_bootstrap
       dockercfg_location = args[0]

data/lib/seira/db.rb

@@ -0,0 +1,140 @@
+require 'securerandom'
+
+module Seira
+  class Db
+    VALID_ACTIONS = %w[create delete list].freeze
+
+    attr_reader :app, :action, :args, :context
+
+    def initialize(app:, action:, args:, context:)
+      @app = app
+      @action = action
+      @args = args
+      @context = context
+    end
+
+    def run
+      case action
+      when 'create'
+        run_create
+      when 'delete'
+        run_delete
+      when 'list'
+        run_list
+      else
+        fail "Unknown command encountered"
+      end
+    end
+
+    private
+
+    def run_create
+      # We allow overriding the version, so you could specify a mysql version but much of the
+      # below assumes postgres for now
+      version = 'POSTGRES_9_6'
+      cpu = 1 # Number of CPUs
+      memory = 4 # GB
+      storage = 10 # GB
+      set_as_primary = false
+
+      name = "#{app}-#{Seira::Random.unique_name(existing_instances)}"
+
+      create_command = "gcloud sql instances create #{name}"
+
+      args.each do |arg|
+        if arg.start_with? '--version='
+          version = arg.split('=')[1]
+        elsif arg.start_with? '--cpu='
+          cpu = arg.split('=')[1]
+        elsif arg.start_with? '--memory='
+          memory = arg.split('=')[1]
+        elsif arg.start_with? '--storage='
+          storage = arg.split('=')[1]
+        elsif arg.start_with? '--set-as-primary='
+          set_as_primary = %w[true yes t y].include?(arg.split('=')[1])
+        elsif /^--[\w\-]+=.+$/.match? arg
+          create_command += " #{arg}"
+        else
+          puts "Warning: Unrecognized argument '#{arg}'"
+        end
+      end
+
+      create_command += " --database-version=#{version}"
+      create_command += " --cpu=#{cpu}"
+      create_command += " --memory=#{memory}"
+      create_command += " --storage-size=#{storage}"
+
+      # Create the sql instance with the specified/default parameters
+      if system(create_command)
+        puts "Successfully created sql instance #{name}"
+      else
+        puts "Failed to create sql instance"
+        exit(1)
+      end
+
+      # Set the root user's password to something secure
+      root_password = SecureRandom.urlsafe_base64(32)
+      if system("gcloud sql users set-password postgres '' --instance=#{name} --password=#{root_password}")
+        puts "Set root password to #{root_password}"
+      else
+        puts "Failed to set root password"
+        exit(1)
+      end
+
+      # Create proxyuser with secure password
+      proxyuser_password = SecureRandom.urlsafe_base64(32)
+      if system("gcloud sql users create proxyuser '' --instance=#{name} --password=#{proxyuser_password}")
+        puts "Created proxyuser with password #{proxyuser_password}"
+      else
+        puts "Failed to create proxyuser"
+        exit(1)
+      end
+
+      # Connect to the instance and remove some of the default group memberships and permissions
+      # from proxyuser, leaving it with only what it needs to be able to do
+      expect_script = <<~BASH
+        set timeout 90
+        spawn gcloud sql connect #{name}
+        expect "Password for user postgres:"
+        send "#{root_password}\\r"
+        expect "postgres=>"
+        send "REVOKE cloudsqlsuperuser FROM proxyuser;\\r"
+        expect "postgres=>"
+        send "ALTER ROLE proxyuser NOCREATEDB NOCREATEROLE;\\r"
+        expect "postgres=>"
+      BASH
+      if system("expect <<EOF\n#{expect_script}EOF")
+        puts "Successfully removed unnecessary permissions from proxyuser"
+      else
+        puts "Failed to remove unnecessary permissions from proxyuser"
+        exit(1)
+      end
+
+      # If setting as primary, update relevant secrets
+      if set_as_primary
+        Secrets.new(app: app, action: 'create-pgbouncer-secret', args: ['proxyuser', proxyuser_password], context: context).run
+        Secrets.new(app: app, action: 'set', args: ["DATABASE_URL=postgres://proxyuser:#{proxyuser_password}@#{app}-pgbouncer-service:6432"], context: context).run
+      end
+      # Regardless of primary or not, store a URL for this db matching its unique name
+      env_name = name.tr('-', '_').upcase
+      Secrets.new(app: app, action: 'set', args: ["#{env_name}_DB_URL=postgres://proxyuser:#{proxyuser_password}@#{app}-pgbouncer-service:6432", "#{env_name}_ROOT_PASSWORD=#{root_password}"], context: context).run
+    end
+
+    def run_delete
+      name = "#{app}-#{args[0]}"
+      if system("gcloud sql instances delete #{name}")
+        puts "Successfully deleted sql instance #{name}"
+      else
+        puts "Failed to delete sql instance #{name}"
+      end
+    end
+
+    def run_list
+      puts existing_instances
+    end
+
+    def existing_instances
+      `gcloud sql instances list --uri`.split("\n").map { |uri| uri.split('/').last }.select { |name| name.start_with? "#{app}-" }.map { |name| name.gsub(/^#{app}-/, '') }
+    end
+  end
+end

data/lib/seira/memcached.rb

@@ -35,11 +35,7 @@ module Seira
     private
 
     def run_list
-      list = `helm list`.split("\n")
-      filtered_list = list.select { |item| item.start_with?("#{app}-memcached") }
-      filtered_list.each do |item|
-        puts item
-      end
+      puts existing_instances
     end
 
     def run_status
@@ -53,8 +49,8 @@ module Seira
       values = {
         resources: {
           requests: {
-            cpu: '1', # roughly 1 vCPU in both AWS and GCP terms
-            memory: '5Gi' # memcached is in-memory - give it a lot
+            memory: '500Mi',
+            cpu: '50m'
           }
         }
       }
@@ -65,19 +61,48 @@ module Seira
           values[:resources][:requests][:memory] = arg.split('=')[1]
         elsif arg.start_with?('--cpu=')
           values[:resources][:requests][:cpu] = arg.split('=')[1]
+        elsif arg.start_with?('--size=')
+          size = arg.split('=')[1]
+          case size
+          when '1'
+            values[:resources][:requests][:memory] = '100Mi'
+            values[:resources][:requests][:cpu] = '50m'
+          when '2'
+            values[:resources][:requests][:memory] = '250Mi'
+            values[:resources][:requests][:cpu] = '100m'
+          when '3'
+            values[:resources][:requests][:memory] = '500Mi'
+            values[:resources][:requests][:cpu] = '200m'
+          when '4'
+            values[:resources][:requests][:memory] = '1Gi'
+            values[:resources][:requests][:cpu] = '500m'
+          when '5'
+            values[:resources][:requests][:memory] = '2Gi'
+            values[:resources][:requests][:cpu] = '500m'
+          when '6'
+            values[:resources][:requests][:memory] = '5Gi'
+            values[:resources][:requests][:cpu] = '1'
+          when '7'
+            values[:resources][:requests][:memory] = '10Gi'
+            values[:resources][:requests][:cpu] = '2'
+          when '8'
+            values[:resources][:requests][:memory] = '50Gi'
+            values[:resources][:requests][:cpu] = '4'
+          else
+            fail "There is no size option '#{size}'"
+          end
         end
       end
 
       file_name = write_config(values)
-      unique_name = "#{Seira::Random.color}-#{Seira::Random.animal}"
+      unique_name = Seira::Random.unique_name(existing_instances)
       name = "#{app}-memcached-#{unique_name}"
       puts `helm install --namespace #{app} --name #{name} --wait -f #{file_name} stable/memcached`
 
       File.delete(file_name)
 
       puts "To get status: 'seira #{context[:cluster]} #{app} memcached status #{unique_name}'"
-      puts "To get credentials for storing in app secrets: 'siera #{context[:cluster]} #{app} memcached credentials #{unique_name}'"
-      puts "Service URI for this memcached instance: 'memcached://#{name}:11211'."
+      puts "Service URI for this memcached instance: 'memcached://#{name}-memcached:11211'."
     end
 
     def run_delete
@@ -104,5 +129,9 @@ module Seira
       end
       file_name
     end
+
+    def existing_instances
+      `helm list`.split("\n").select { |item| item.start_with?("#{app}-memcached") }.map { |name| name.gsub(/^#{app}-memcached-/, '') }
+    end
   end
 end

data/lib/seira/pods.rb

@@ -1,19 +1,20 @@
+require 'json'
+
 module Seira
   class Pods
-    VALID_ACTIONS = %w[list delete logs top run].freeze
+    VALID_ACTIONS = %w[list delete logs top run connect].freeze
 
-    attr_reader :app, :action, :key, :value, :context
+    attr_reader :app, :action, :args, :pod_name, :context
 
     def initialize(app:, action:, args:, context:)
       @app = app
       @action = action
       @context = context
-      @key = args[0]
-      @value = args[1]
+      @args = args
+      @pod_name = args[0]
     end
 
     def run
-      # TODO: Some options: 'top', 'kill', 'delete', 'logs'
       case action
       when 'list'
         run_list
@@ -23,6 +24,8 @@ module Seira
         run_logs
       when 'top'
         run_top
+      when 'connect'
+        run_connect
       when 'run'
         run_run
       else
@@ -33,38 +36,116 @@ module Seira
     private
 
     def run_list
-      puts list_pods
+      puts `kubectl get pods --namespace=#{app} -o wide`
     end
 
     def run_delete
-      puts `kubectl delete pod #{@key} --namespace=#{@app}`
+      puts `kubectl delete pod #{pod_name} --namespace=#{app}`
     end
 
     def run_logs
-      puts `kubectl logs #{@key} --namespace=#{@app} -c #{@app}`
+      puts `kubectl logs #{pod_name} --namespace=#{app} -c #{app}`
     end
 
     def run_top
-      puts `kubectl top pod #{@key} --namespace=#{@app} --containers`
+      puts `kubectl top pod #{pod_name} --namespace=#{app} --containers`
     end
 
-    def run_run
-      pod_list = list_pods.split("\n")
-      target_pod_type = "#{@app}-web"
-      target_pod_options = pod_list.select { |pod| pod.include?(target_pod_type) }
-
-      if target_pod_options.count > 0
-        target_pod = target_pod_options[0]
-        pod_name = target_pod.split(" ")[0]
-        puts pod_name
-        system("kubectl exec -ti #{pod_name} --namespace=#{@app} -- bash")
+    def run_connect
+      # If a pod name is specified, connect to that pod; otherwise pick a random web pod
+      target_pod_name = pod_name || fetch_pods(app: app, tier: 'web').sample&.dig('metadata', 'name')
+
+      if target_pod_name
+        connect_to_pod(target_pod_name)
       else
-        puts "Could not find web with name #{target_pod_type} to attach to"
+        puts "Could not find web pod to connect to"
+      end
+    end
+
+    def run_run
+      # Set defaults
+      tier = 'web'
+      clear_commands = false
+
+      # Loop through args and process any that aren't just the command to run
+      loop do
+        arg = args.first
+        if arg.nil?
+          puts 'Please specify a command to run'
+          exit(1)
+        end
+        break unless arg.start_with? '--'
+        if arg.start_with? '--tier='
+          tier = arg.split('=')[1]
+        elsif arg.start_with? '--clear-commands='
+          clear_commands = %w[true yes t y].include? arg.split('=')[1]
+        else
+          puts "Warning: Unrecognized argument #{arg}"
+        end
+        args.shift
+      end
+
+      # Any remaining args are the command to run
+      command = args.join(' ')
+
+      # Find a 'template' pod from the proper tier
+      template_pod = fetch_pods(app: app, tier: tier).first
+      if template_pod.nil?
+        puts "Unable to find #{tier} tier pod to copy config from"
+        exit(1)
       end
+
+      # Use that template pod's configuration to create a new temporary pod
+      temp_name = "#{app}-temp-#{Random.unique_name}"
+      spec = template_pod['spec']
+      temp_pod = {
+        apiVersion: template_pod['apiVersion'],
+        kind: 'Pod',
+        spec: spec,
+        metadata: {
+          name: temp_name
+        }
+      }
+      spec['restartPolicy'] = 'Never'
+      if clear_commands
+        spec['containers'].each do |container|
+          container['command'] = ['bash', '-c', 'tail -f /dev/null']
+        end
+      end
+
+      puts "Creating temporary pod #{temp_name}"
+      unless system("kubectl --namespace=#{app} create -f - <<JSON\n#{temp_pod.to_json}\nJSON")
+        puts 'Failed to create pod'
+        exit(1)
+      end
+
+      # Check pod status until it's ready to connect to
+      print 'Waiting for pod to start...'
+      loop do
+        pod = JSON.parse(`kubectl --namespace=#{app} get pods/#{temp_name} -o json`)
+        break if pod['status']['phase'] == 'Running'
+        print '.'
+        sleep 1
+      end
+      print "\n"
+
+      # Connect to the pod, running the specified command
+      connect_to_pod(temp_name, command)
+
+      # Clean up
+      unless system("kubectl --namespace=#{app} delete pod #{temp_name}")
+        puts "Warning: failed to clean up pod #{temp_name}"
+      end
+    end
+
+    def fetch_pods(filters)
+      filter_string = filters.map { |k, v| "#{k}=#{v}" }.join(',')
+      JSON.parse(`kubectl get pods --namespace=#{app} -o json --selector=#{filter_string}`)['items']
     end
 
-    def list_pods
-      `kubectl get pods --namespace=#{@app} -o wide`
+    def connect_to_pod(name, command = 'bash')
+      puts "Connecting to #{name}..."
+      system("kubectl exec -ti #{name} --namespace=#{app} -- #{command}")
     end
   end
 end

data/lib/seira/random.rb

@@ -1,6 +1,13 @@
 # For random colors for resource installations via helm
 module Seira
   class Random
+    def self.unique_name(existing = [])
+      loop do
+        name = "#{color}-#{animal}"
+        return name unless existing.include? name
+      end
+    end
+
     def self.color
       %w[
         red
@@ -49,7 +56,6 @@ module Seira
         antelope
         ape
         armadillo
-        ass
         avocet
         axolotl
         baboon
@@ -374,6 +380,7 @@ module Seira
         uakari
         uguisu
         umbrellabird
+        unicorn
         viper
         vulture
         wallaby

data/lib/seira/redis.rb

@@ -35,11 +35,7 @@ module Seira
     private
 
     def run_list
-      list = `helm list`.split("\n")
-      filtered_list = list.select { |item| item.start_with?("#{app}-redis") }
-      filtered_list.each do |item|
-        puts item
-      end
+      puts existing_instances
     end
 
     def run_status
@@ -52,16 +48,18 @@ module Seira
       # TODO: Enable metrics
       values = {
         persistence: {
-          size: '32Gi'
+          size: '1Gi'
         },
         resources: {
           requests: {
-            cpu: '2', # roughly 2 vCPU in both AWS and GCP terms
-            memory: '8Gi' # redis is in-memory - give it a lot
+            cpu: '50m',
+            memory: '50Mi'
           }
         }
       }
 
+      # Redis is single-threaded, thus only one CPU is needed? Primary/replica
+      # is needed for further throughput
       args.each do |arg|
         puts "Applying arg #{arg} to values"
         if arg.start_with?('--memory=')
@@ -74,9 +72,41 @@ module Seira
           size = arg.split('=')[1]
           case size
           when '1'
-            values[:resources][:requests][:memory] = '100Mi' # 100mb
+            values[:resources][:requests][:memory] = '50Mi'
+            values[:persistence][:size] = '1Gi'
+            values[:resources][:requests][:cpu] = '50m'
+          when '2'
+            values[:resources][:requests][:memory] = '100Mi'
+            values[:persistence][:size] = '1Gi'
+            values[:resources][:requests][:cpu] = '100m'
+          when '3'
+            values[:resources][:requests][:memory] = '250Mi'
+            values[:persistence][:size] = '1Gi'
+            values[:resources][:requests][:cpu] = '200m'
+          when '4'
+            values[:resources][:requests][:memory] = '500Mi'
+            values[:persistence][:size] = '1Gi'
+            values[:resources][:requests][:cpu] = '500m'
+          when '5'
+            values[:resources][:requests][:memory] = '1Gi'
+            values[:persistence][:size] = '5Gi'
+            values[:resources][:requests][:cpu] = '1'
+          when '6'
+            values[:resources][:requests][:memory] = '2Gi'
+            values[:persistence][:size] = '5Gi'
+            values[:resources][:requests][:cpu] = '1'
+          when '7'
+            values[:resources][:requests][:memory] = '5Gi'
             values[:persistence][:size] = '5Gi'
-            values[:resources][:requests][:cpu] = '100m' # .1 cpu
+            values[:resources][:requests][:cpu] = '1'
+          when '8'
+            values[:resources][:requests][:memory] = '10Gi'
+            values[:persistence][:size] = '20Gi'
+            values[:resources][:requests][:cpu] = '1'
+          when '9'
+            values[:resources][:requests][:memory] = '20Gi'
+            values[:persistence][:size] = '40Gi'
+            values[:resources][:requests][:cpu] = '1'
           else
             fail "There is no size option '#{size}'"
           end
@@ -84,7 +114,7 @@ module Seira
       end
 
       file_name = write_config(values)
-      unique_name = "#{Seira::Random.color}-#{Seira::Random.animal}"
+      unique_name = Seira::Random.unique_name(existing_instances)
       name = "#{app}-#{unique_name}"
       puts `helm install --namespace #{app} --name #{name} --wait -f #{file_name} stable/redis`
 
@@ -119,5 +149,9 @@ module Seira
       end
       file_name
     end
+
+    def existing_instances
+      list = `helm list`.split("\n").select { |item| item.start_with?("#{app}-redis") }.map { |name| name.gsub(/^#{app}-redis-/, '') }
+    end
   end
 end

data/lib/seira/secrets.rb

@@ -2,37 +2,34 @@ require 'json'
 require 'base64'
 
 # Example usages:
-# seira staging specs secret set RAILS_ENV staging
+# seira staging specs secret set RAILS_ENV=staging
 # seira demo tracking secret unset DISABLE_SOME_FEATURE
 # seira staging importer secret list
-# TODO: Multiple secrets in one command
 # TODO: Can we avoid writing to disk completely and instead pipe in raw json?
 module Seira
   class Secrets
     VALID_ACTIONS = %w[get set unset list list-decoded create-pgbouncer-secret].freeze
     PGBOUNCER_SECRETS_NAME = 'pgbouncer-secrets'.freeze
 
-    attr_reader :app, :action, :key, :value, :args, :context
+    attr_reader :app, :action, :args, :context
 
     def initialize(app:, action:, args:, context:)
       @app = app
       @action = action
       @args = args
-      @key = args[0]
-      @value = args[1]
       @context = context
     end
 
     def run
       case action
       when 'get'
-        perform_key_validation
+        validate_single_key
         run_get
       when 'set'
-        perform_key_validation
+        validate_keys_and_values
         run_set
       when 'unset'
-        perform_key_validation
+        validate_single_key
         run_unset
       when 'list'
         run_list
@@ -40,8 +37,6 @@ module Seira
         run_list_decoded
       when 'create-pgbouncer-secret'
         run_create_pgbouncer_secret
-      when 'bootstrap-cluster'
-        run_bootstrap_cluster
       else
         fail "Unknown command encountered"
       end
@@ -69,22 +64,28 @@ module Seira
 
     private
 
-    def perform_key_validation
+    def validate_single_key
       if key.nil? || key.strip == ""
         puts "Please specify a key in all caps and with underscores"
         exit(1)
       end
     end
 
+    def validate_keys_and_values
+      if args.empty? || !args.all? { |arg| /^[^=]+=.+$/ =~ arg }
+        puts "Please list keys and values to set like KEY_ONE=value_one KEY_TWO=value_two"
+        exit(1)
+      end
+    end
+
     def run_get
       secrets = fetch_current_secrets
       puts "#{key}: #{Base64.decode64(secrets['data'][key])}"
     end
 
     def run_set
-      fail "Please specify a value as the third argument" if value.nil? || value.strip == ""
       secrets = fetch_current_secrets
-      secrets['data'][key] = Base64.encode64(value)
+      secrets['data'].merge!(key_value_map.transform_values { |value| Base64.strict_encode64(value) })
       write_secrets(secrets: secrets)
     end
 
@@ -113,7 +114,7 @@ module Seira
     def run_create_pgbouncer_secret
       db_user = args[0]
       db_password = args[1]
-      puts `kubectl create secret generic #{PGBOUNCER_SECRETS_NAME} --namespace #{app} --from-literal=DB_USER=#{db_user} --from-literal=DB_PASSWORD=#{db_password}`
+      write_secrets(secrets: { DB_USER: db_user, DB_PASSWORD: db_password }, secret_name: PGBOUNCER_SECRETS_NAME)
     end
 
     # In the normal case the secret we are updating is just main_secret_name,
@@ -144,5 +145,16 @@ module Seira
       fail "Unexpected Kind" unless json['kind'] == 'Secret'
       json
     end
+
+    def key
+      args[0]
+    end
+
+    def key_value_map
+      args.map do |arg|
+        equals_index = arg.index('=')
+        [arg[0..equals_index - 1], arg[equals_index + 1..-1]]
+      end.to_h
+    end
   end
 end

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -105,6 +105,7 @@ files:
 - lib/seira.rb
 - lib/seira/app.rb
 - lib/seira/cluster.rb
+- lib/seira/db.rb
 - lib/seira/memcached.rb
 - lib/seira/pods.rb
 - lib/seira/proxy.rb