seira 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b267c856966fa9d1bc45dbc7bc438409b3d1063f3153a0e73ace8df2e957b9b9
-  data.tar.gz: fb3b80730b70076fbd01c42418bd2d20f7890e6bd76d43c64cc75d99c8941440
+  metadata.gz: 4fdaf37b83e2d2c8d1b9452276f51e5955e298d81ede2c7c7d26dc3fa10472c7
+  data.tar.gz: c8f70d1c979b06746bbb4a6cab24069f8cd0bf14ee5cc70b0990b18461678c68
 SHA512:
-  metadata.gz: 1525fe34f26af87c6a39711922c16aa818e1824a1f20e8c10ac202af8432a55008c1f1130a19af64c6c71615bfbd651c9d9287ee75a6f6336a146420d80968ec
-  data.tar.gz: ffa5b5331fd8381478b22ecac09f10794f17e3fae9d26442510290f7d5e47ddf5159b538f17835798772ea7a26cb39e4a2cefb2de210ca46c7d333885857dff2
+  metadata.gz: ec5a2c3c3d127d6266f5d75833f68f8edffc68d03c79d37afe391b4726d228adc4c1a8bb1ec3dc1735dc9dbebbece897e93195241e7b3a2c840b80a60eb80ee1
+  data.tar.gz: 6c767329a56b80239bca99d73f041633a59eaa0ec57c2e77b0b214e4076b761b207627884ac962d5659b43df73a595f12782f6a5a8c7a8ce1466077f9b09a0a8

data/lib/seira/db.rb

@@ -2,13 +2,20 @@ require 'securerandom'
 require 'English'
 
 require_relative 'db/alter_proxyuser_roles'
+require_relative 'db/write_pgbouncer_yaml'
 require_relative 'db/create'
 
 module Seira
   class Db
     include Seira::Commands
 
-    VALID_ACTIONS = %w[help create delete list restart connect ps kill analyze create-readonly-user psql table-sizes index-sizes vacuum unused-indexes unused-indices user-connections info alter-proxyuser-roles add].freeze
+    VALID_ACTIONS = %w[
+      help create delete list restart connect ps kill
+      analyze create-readonly-user psql table-sizes
+      index-sizes vacuum unused-indexes unused-indices
+      user-connections info alter-proxyuser-roles add
+      write-pgbouncer-yaml
+    ].freeze
     SUMMARY = "Manage your Cloud SQL Postgres databases.".freeze
 
     attr_reader :app, :action, :args, :context
@@ -60,6 +67,8 @@ module Seira
         run_info
       when 'alter-proxyuser-roles'
         run_alter_proxyuser_roles
+      when 'write-pgbouncer-yaml'
+        run_write_pgbouncer_yaml
       else
         fail "Unknown command encountered"
       end
@@ -101,6 +110,7 @@ module Seira
         user-connections:       List number of connections per user
         vacuum:                 Run a VACUUM ANALYZE
         alter-proxyuser-roles:  Update NOCREATEDB and NOCREATEROLE roles for proxyuser in cloud sql.
+        write-pbouncer-yaml:    Produces a Kubernetes Deployment yaml to run Pgbouncer for specified database.
       HELPTEXT
     end
 
@@ -116,6 +126,10 @@ module Seira
       Seira::Db::AlterProxyuserRoles.new(app: app, action: action, args: args, context: context).run
     end
 
+    def run_write_pgbouncer_yaml
+      Seira::Db::WritePgbouncerYaml.new(app: app, args: args, context: context).run
+    end
+
     def run_delete
       name = "#{app}-#{args[0]}"
       if gcloud("sql instances delete #{name}", context: context, format: :boolean)

data/lib/seira/db/create.rb

@@ -39,11 +39,10 @@ module Seira
         end
 
         set_secrets
-        write_pgbouncer_yaml
 
         alter_proxy_user_roles if replica_for.nil?
 
-        puts "To use this database, deploy the pgbouncer config file that was created and use the ENV that was set."
+        puts "To use this database, use write-pgbouncer-yaml command and deploy the pgbouncer config file that was created and use the ENV that was set."
         puts "To make this database the primary, promote it using the CLI and update the DATABASE_URL."
       end
 
@@ -217,122 +216,6 @@ module Seira
       def ips
         @ips ||= Helpers.sql_ips(name, context: context)
       end
-
-      def write_pgbouncer_yaml
-        # TODO: Clean this up by moving into a proper templated yaml file
-        pgbouncer_yaml = <<-FOO
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: #{name}-pgbouncer
-  namespace: #{app}
-  labels:
-    app: #{app}
-    tier: #{pgbouncer_tier}
-    database: #{name}
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: #{app}
-      tier: #{pgbouncer_tier}
-      database: #{name}
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-  template:
-    metadata:
-      labels:
-        app: #{app}
-        tier: #{pgbouncer_tier}
-        database: #{name}
-    spec:
-      containers:
-        - image: handshake/pgbouncer:0.2.0
-          name: pgbouncer
-          ports:
-            - containerPort: 6432
-              protocol: TCP
-          envFrom:
-            - secretRef:
-                name: #{pgbouncer_secret_name}
-          env:
-            - name: "PGPORT"
-              value: "6432"
-            - name: "PGDATABASE"
-              value: "#{@database_name || default_database_name}"
-            - name: "DB_HOST"
-              value: "#{ips[:private]}" # private IP for #{name}
-            - 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;"]
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            tcpSocket:
-              port: 6432
-            initialDelaySeconds: 15
-            periodSeconds: 20
-          resources:
-            requests:
-              cpu: 100m
-              memory: 300Mi
-          lifecycle:
-            preStop:
-              exec:
-                command: ["/bin/sh", "-c", "killall -INT pgbouncer && sleep 20"]
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: #{pgbouncer_service_name}
-  namespace: #{app}
-  labels:
-    app: #{app}
-    tier: #{pgbouncer_tier}
-spec:
-  type: ClusterIP
-  ports:
-    - protocol: TCP
-      port: 6432
-      targetPort: 6432
-  selector:
-    app: #{app}
-    tier: #{pgbouncer_tier}
-    database: #{name}
-FOO
-
-        File.write("kubernetes/#{context[:cluster]}/#{app}/pgbouncer-#{name.gsub("#{app}-", '')}.yaml", pgbouncer_yaml)
-      end
     end
   end
 end

data/lib/seira/db/write_pgbouncer_yaml.rb

@@ -0,0 +1,158 @@
+module Seira
+  class Db
+    class WritePgbouncerYaml
+      include Seira::Commands
+
+      attr_reader :app, :name, :context
+
+      def initialize(app:, args:, context:)
+        if args.length != 1
+          puts 'Specify db name as positional argument'
+          exit(1)
+        end
+
+        @app = app
+        @name = args[0]
+        @context = context
+      end
+
+      def run
+        write_pgbouncer_yaml
+      end
+
+      private
+
+      def pgbouncer_secret_name
+        "#{name}-pgbouncer-secrets"
+      end
+
+      def pgbouncer_service_name
+        "#{name}-pgbouncer-service"
+      end
+
+      def pgbouncer_tier
+        name.gsub("#{app}-", "")
+      end
+
+      def ips
+        @ips ||= Helpers.sql_ips(name, context: context)
+      end
+
+      def write_pgbouncer_yaml
+        # TODO: Clean this up by moving into a proper templated yaml file
+        pgbouncer_yaml = <<-FOO
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: #{name}-pgbouncer
+  namespace: #{app}
+  labels:
+    app: #{app}
+    tier: #{pgbouncer_tier}
+    database: #{name}
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: #{app}
+      tier: #{pgbouncer_tier}
+      database: #{name}
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+  template:
+    metadata:
+      labels:
+        app: #{app}
+        tier: #{pgbouncer_tier}
+        database: #{name}
+    spec:
+      containers:
+        - image: handshake/pgbouncer:0.3.1
+          name: pgbouncer
+          ports:
+            - containerPort: 6432
+              protocol: TCP
+          envFrom:
+            - secretRef:
+                name: #{pgbouncer_secret_name}
+          env:
+            - name: "PGPORT"
+              value: "6432"
+            - name: "PGDATABASE"
+              value: "#{name}"
+            - name: "DB_HOST"
+              value: "#{ips[:private]}" # private IP for #{name}
+            - 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;"]
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: 6432
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          resources:
+            requests:
+              cpu: 100m
+              memory: 300Mi
+          lifecycle:
+            preStop:
+              exec:
+                command: ["/bin/sh", "-c", "killall -INT pgbouncer && sleep 20"]
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: #{pgbouncer_service_name}
+  namespace: #{app}
+  labels:
+    app: #{app}
+    tier: #{pgbouncer_tier}
+spec:
+  type: ClusterIP
+  ports:
+    - protocol: TCP
+      port: 6432
+      targetPort: 6432
+  selector:
+    app: #{app}
+    tier: #{pgbouncer_tier}
+    database: #{name}
+FOO
+
+        File.write("kubernetes/#{context[:cluster]}/#{app}/pgbouncer-#{name.gsub("#{app}-", '')}.yaml", pgbouncer_yaml)
+      end
+    end
+  end
+end

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.6.2".freeze
+  VERSION = "0.6.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -127,6 +127,7 @@ files:
 - lib/seira/db.rb
 - lib/seira/db/alter_proxyuser_roles.rb
 - lib/seira/db/create.rb
+- lib/seira/db/write_pgbouncer_yaml.rb
 - lib/seira/jobs.rb
 - lib/seira/node_pools.rb
 - lib/seira/pods.rb