seira 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13e90be6c49b6c588feb4e4f5ebd824eced2c816e889ee6b1a4902624a66493
-  data.tar.gz: 3681880d3d4d0e4e172c1951b177469e1ebba7328d32d3576633d8d4142c8fc4
+  metadata.gz: 75b53632541063c8bd33733ac62c7a668191b47f069eff4e63e6380459c9869e
+  data.tar.gz: b1bce085818c5f3686009026eafbb8093def1508de90ab632e928fbde3ca3e10
 SHA512:
-  metadata.gz: 29da919be3b42250f0e6e7bc804570bfdef3700de147cffe2a4bed370b11ea1599ea1270b402e7c9314baaf9ecab4ffe694999fa73bdc5fd6e5efc2d5d2c0a21
-  data.tar.gz: b746c04b397f57f08ace72f133b4d9638d5a053037672ea518193c4929548170c22cd45bf6eee089c19bd8a007221c991c63bf68100044dab78e43c59da5a55a
+  metadata.gz: 2cbf59bce9f817597cf68954e0962ad1fbe403521016bc458da371ff464c2995f6294d295b74eb38d8b49bf11088a168818f205300443ab21e8012a5835ac132
+  data.tar.gz: f3eff8d111e66c49b51ce6beeab4d4c3d2acbc51bf1b95863e19e1ec774bf030a8c2f6971bea00bc97aaaffc8f0a52097ef0a15e484982cef325c18711d6a440

data/README.md

@@ -48,27 +48,30 @@ A configuration file is expected at `.seira.yml` relative path. Below is an exam
 ```
 seira:
   organization_id: "11111"
-  default_zone: "us-central1-a"
   clusters:
     internal:
       project: org-internal
       cluster: gke_org-internal_us-central1-a_internal
+      region: us-central1
       zone: us-central1-b
       aliases:
         - "i"
     staging:
       project: org-staging
       cluster: gke_org-staging_us-central1-a_staging
+      region: us-central1
       aliases:
         - "s"
     demo:
       project: org-demo
       cluster: gke_org-demo_us-central1-a_demo
+      region: us-central1
       aliases:
         - "d"
     production:
       project: org-production
       cluster: gke_org-production_us-central1-a_production
+      region: us-central1
       aliases:
         - "p"
   applications:
@@ -80,6 +83,10 @@ seira:
 
 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.
 
+### Regions and Zones
+
+All clusters should have a `region` option specified. For zonal clusters (clusters that are NOT regional) should also specify their `zone`.
+
 ### Manifest Files
 
 Seira expects your Kubernetes manifests to exist in the "kubernetes/cluster-name/app-name" directory. When a deploy is run on `foo` app in `staging` cluster, it looks to `kubernetes/staging/foo` directory for the manifest files.

data/lib/seira.rb

@@ -136,7 +136,8 @@ module Seira
         cluster: cluster,
         project: project,
         settings: settings,
-        default_zone: settings.default_zone,
+        region: cluster['region'],
+        zone: cluster['zone'],
         app: app,
         action: action,
         args: args

data/lib/seira/app.rb

@@ -80,6 +80,11 @@ module Seira
       revision = nil
       deployment = :all
 
+      warn_env = context[:settings].expected_environment_variable_during_deploys
+      if warn_env && ENV[warn_env].nil?
+        exit(1) unless HighLine.agree("WARNING: Expected '#{warn_env}' to be present, but is not. This might mean your are running a deploy in an environment that is not safe. Are you sure you want to continue? This command will apply your *local* kubernetes configs. If you continue, make sure you have the latest master changes and valid local YAML.")
+      end
+
       args.each do |arg|
         if arg == '--async'
           async = true

data/lib/seira/db/create.rb

@@ -204,30 +204,8 @@ module Seira
 
       def write_pgbouncer_yaml
         # TODO: Clean this up by moving into a proper templated yaml file
-        # TODO: Fix warning from cloudsql-proxy. We use context[:default_zone] for the DB Instance name
-        # which causes this error: got region "us-central1-c", want "us-central1".
         pgbouncer_yaml = <<-FOO
 ---
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: #{pgbouncer_configs_name}
-  namespace: #{app}
-data:
-  DB_HOST: "127.0.0.1"
-  DB_PORT: "5432"
-  LISTEN_PORT: "6432"
-  LISTEN_ADDRESS: "*"
-  TCP_KEEPALIVE: "1"
-  TCP_KEEPCNT: "5"
-  TCP_KEEPIDLE: "300" # see: https://git.io/vi0Aj
-  TCP_KEEPINTVL: "300"
-  LOG_DISCONNECTIONS: "0" # spammy, not needed
-  MAX_CLIENT_CONN: "500"
-  MAX_DB_CONNECTIONS: "90"
-  DEFAULT_POOL_SIZE: "90"
-  POOL_MODE: "transaction"
----
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -239,7 +217,6 @@ metadata:
     database: #{name}
 spec:
   replicas: 2
-  minReadySeconds: 20
   strategy:
     type: RollingUpdate
     rollingUpdate:
@@ -268,6 +245,34 @@ spec:
               value: "6432"
             - name: "PGDATABASE"
               value: "#{@database_name || default_database_name}"
+            - name: "DB_HOST"
+              value: "127.0.0.1" # Exposed by cloudsql proxy
+            - name: "DB_PORT"
+              value: "5432"
+            - name: "LISTEN_PORT"
+              value: "6432"
+            - name: "LISTEN_ADDRESS"
+              value: "*"
+            - name: "TCP_KEEPALIVE"
+              value: "1"
+            - name: "TCP_KEEPCNT"
+              value: "5"
+            - name: "TCP_KEEPIDLE"
+              value: "300" # see: https://git.io/vi0Aj
+            - name: "TCP_KEEPINTVL"
+              value: "300"
+            - name: "LOG_DISCONNECTIONS"
+              value: "0" # spammy, not needed
+            - name: "MAX_CLIENT_CONN"
+              value: "1000"
+            - name: "MIN_POOL_SIZE"
+              value: "20" # This and DEFAULT should be roughly cpu cores * 2. Don't set too high.
+            - name: "DEFAULT_POOL_SIZE"
+              value: "20"
+            - name: "MAX_DB_CONNECTIONS"
+              value: "20"
+            - name: "POOL_MODE"
+              value: "transaction"
           readinessProbe:
             exec:
               command: ["psql", "-c", "SELECT 1;"]
@@ -287,7 +292,7 @@ spec:
           command:
             - /cloud_sql_proxy
             - --dir=/cloudsql
-            - -instances=#{context[:project]}:#{context[:default_zone]}:#{name}=tcp:5432
+            - -instances=#{context[:project]}:#{context[:region]}:#{name}=tcp:5432
             - -credential_file=/secrets/cloudsql/credentials.json
           ports:
             - containerPort: 5432

data/lib/seira/random.rb

@@ -11,10 +11,18 @@ module Seira
         name = "#{adjective}-#{animal}"
         attempts += 1
         return name unless existing.include? name
+        return name unless unallowed_name?(name)
         fail "Too many failed unique name attempts" if attempts > MAX_UNIQUE_NAME_ATTEMPTS
       end
     end
 
+    def self.unallowed_name?(name)
+      # Robin always keeps his cool
+      return true if name == "exasperated-robin"
+
+      false
+    end
+
     # List sourced from https://www.mobap.edu/wp-content/uploads/2013/01/list_of_adjectives.pdf
     def self.adjective
       adjectives_lis_file = File.join(File.expand_path('../..', File.dirname(__FILE__)), 'resources', 'adjectives.txt')

data/lib/seira/settings.rb

@@ -20,10 +20,6 @@ module Seira
       settings['seira']['organization_id']
     end
 
-    def default_zone
-      settings['seira']['default_zone']
-    end
-
     def applications
       settings['seira']['applications'].map { |app| app['name'] }
     end
@@ -60,6 +56,10 @@ module Seira
       settings['seira']['clusters'][cluster]['project']
     end
 
+    def expected_environment_variable_during_deploys
+      settings['seira']['expected_environment_variable_during_deploys']
+    end
+
     private
 
     def parse_settings

data/lib/seira/setup.rb

@@ -76,13 +76,33 @@ module Seira
         system("gcloud auth login")
       end
 
+      # All cluster configs must specify a project and region. Region is required, even
+      # if cluster is zonal, for other things like databases.
       system("gcloud config set project #{cluster_metadata['project']}")
-      system("gcloud config set compute/zone #{cluster_metadata['zone'] || settings.default_zone}")
+      system("gcloud config set compute/region #{cluster_metadata['region']}")
+
+      # Regional and zonal clusters have slightly different behavior. We need
+      # to make sure that the zone is *not* set for regional cluster, or gcloud
+      # will complain. And zone *needs* to be set for zonal clusters.
+      if cluster_metadata['zone']
+        system("gcloud config set compute/zone #{cluster_metadata['zone']}")
+      else
+        system("gcloud config unset compute/zone")
+      end
+
       puts "Your new gcloud setup for #{cluster_name}:"
       system("gcloud config configurations describe #{cluster_name}")
 
-      puts "Configuring kubectl for interactions with this project's kubernetes cluster"
-      system("gcloud container clusters get-credentials #{cluster_name} --project #{cluster_metadata['project']}")
+      puts "Configuring kubectl for interactions with this project's kubernetes cluster with region #{cluster_metadata['region']} and zone #{cluster_metadata['zone']}"
+
+      # For regional clusters, we use the beta --region option. For zonal clusters, we pass --zone. Regional
+      # clusters are in the beta feature of gcloud.
+      if cluster_metadata['zone']
+        system("gcloud container clusters get-credentials #{cluster_name} --project #{cluster_metadata['project']} --zone #{cluster_metadata['zone']}")
+      else
+        system("gcloud beta container clusters get-credentials #{cluster_name} --project #{cluster_metadata['project']} --region #{cluster_metadata['region']}")
+      end
+
       puts "Your kubectl is set up with:"
       system("kubectl config current-context")
     end

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.4.10".freeze
+  VERSION = "0.5.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-02 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline