Updated manifests

tzumby · Jun 23, 2017 · b68c57a · b68c57a
1 parent a941655
commit b68c57a
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 14 deletions.
diff --git a/config/database.yml b/config/database.yml
@@ -23,6 +23,6 @@ production:
   <<: *default
   database: <%= ENV.fetch("DATABASE_NAME") %>
   username: <%= ENV.fetch("DATABASE_USER") %>
-  password: <%= ENV.fetch("DATABASE_PASS") %>
+  password: <%= ENV.fetch("DATABASE_PASSWORD") %>
   host: <%= ENV.fetch("DATABASE_URL") %>
   port: <%= ENV.fetch("DATABASE_PORT") %>
diff --git a/config/routes.rb b/config/routes.rb
@@ -7,6 +7,4 @@
   devise_scope :user do
     root to: "devise/sessions#new"
   end
-
-  # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end
diff --git a/kube/postgres.yaml b/kube/postgres.yaml
@@ -63,9 +63,15 @@ spec:
         image: postgres:latest
         env:
         - name: POSTGRES_USER
-          value: postgres
+          valueFrom:
+            secretKeyRef:
+              name: db-user
+              key: username
         - name: POSTGRES_PASSWORD
-          value: mysecurepass
+          valueFrom:
+            secretKeyRef:
+              name: db-user-pass
+              key: password
         - name: POSTGRES_DB
           value: rails-kube-demo_development
         - name: PGDATA

diff --git a/kube/rails.yaml b/kube/rails.yaml
@@ -34,23 +34,34 @@ spec:
         env:
         - name: RAILS_LOG_TO_STDOUT
           value: "true"
+        - name: RAILS_SERVE_STATIC_FILES
+          value: "true"
         - name: DATABASE_NAME
           value: "rails-kube-demo_production"
         - name: DATABASE_PORT
           value: "5432"
         - name: DATABASE_URL
           value: "postgres"
         - name: DATABASE_USER
-          value: "postgres"
-        - name: DATABASE_PASS
-          value: "mysecurepass"
+          valueFrom:
+            secretKeyRef:
+              name: db-user
+              key: username
+        - name: DATABASE_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: db-user-pass
+              key: password
         - name: REDIS_URL
           value: "redis"
         - name: REDIS_PORT
           value: "6379"
         - name: RAILS_ENV
           value: "production"
         - name: SECRET_KEY_BASE
-          value: "50dae16d7d1403e175ceb2461605b527cf87a5b18479740508395cb3f1947b12b63bad049d7d1545af4dcafa17a329be4d29c18bd63b421515e37b43ea43df64"
+          valueFrom:
+            secretKeyRef:
+              name: secret-key-base
+              key: secret-key-base 
         ports:
-        - containerPort: 3000
+          - containerPort: 3000
diff --git a/kube/setup.yaml b/kube/setup.yaml
@@ -19,17 +19,26 @@ spec:
         - name: DATABASE_URL
           value: "postgres"
         - name: DATABASE_USER
-          value: "postgres"
+          valueFrom:
+            secretKeyRef:
+              name: db-user
+              key: username
         - name: DATABASE_PASS
-          value: "mysecurepass"
+          valueFrom:
+            secretKeyRef:
+              name: db-user-pass
+              key: password 
         - name: REDIS_URL
           value: "redis"
         - name: REDIS_PORT
           value: "6379"
         - name: RAILS_ENV
           value: "production"
         - name: SECRET_KEY_BASE
-          value: "50dae16d7d1403e175ceb2461605b527cf87a5b18479740508395cb3f1947b12b63bad049d7d1545af4dcafa17a329be4d29c18bd63b421515e37b43ea43df64"
+          valueFrom:
+            secretKeyRef:
+              name: secret-key-base
+              key: secret-key-base  
         - name: REDIS_URL
           value: redis
         - name: REDIS_PORT

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
@@ -1,6 +1,6 @@
 namespace :docker do
   desc "Push docker images to DockerHub"
-  task :push do
+  task :push_image do
     TAG = `git rev-parse --short HEAD`.strip
 
     puts "Building Docker image"