switch to secrets

env/base/catalog-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: barretthousen-service
       containers:
         - name: catalog
-          image: barretthousen/service-catalog:prod
+          image: barretthousen/service-catalog:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 5001
@@ -33,8 +33,8 @@ spec:
               name: catalog-config
       volumes:
         - name: catalog-config
-          configMap:
-            name: catalog-config
+          secret:
+            secretName: catalog-config
 ---
 apiVersion: v1
 kind: Service
@@ -48,10 +48,10 @@ spec:
       targetPort: 5001
 ---
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: catalog-config
-data:
+stringData:
   config.yaml: |
     log_level: 2
     port: 5001

env/base/proxy-admin-deployment.yaml

@@ -14,7 +14,7 @@ spec:
       serviceAccountName: barretthousen-service
       containers:
         - name: proxy-admin
-          image: barretthousen/service-proxy-admin:prod
+          image: barretthousen/service-proxy-admin:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 80
@@ -30,8 +30,8 @@ spec:
               mountPath: /config/
       volumes:
         - name: proxy-admin-config
-          configMap:
-            name: proxy-admin-config
+          secret:
+            secretName: proxy-admin-config
 ---
 apiVersion: v1
 kind: Service
@@ -45,10 +45,10 @@ spec:
       targetPort: 80
 ---
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: proxy-admin-config
-data:
+stringData:
   config.yaml: |
     log_level: 2
     port: 80

env/base/proxy-client-deployment.yaml

@@ -14,7 +14,7 @@ spec:
       serviceAccountName: barretthousen-service
       containers:
         - name: proxy-client
-          image: barretthousen/service-proxy-client:prod
+          image: barretthousen/service-proxy-client:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 80
@@ -30,8 +30,8 @@ spec:
               mountPath: /config/
       volumes:
         - name: proxy-client-config
-          configMap:
-            name: proxy-client-config
+          secret:
+            secretName: proxy-client-config
 ---
 apiVersion: v1
 kind: Service
@@ -45,10 +45,10 @@ spec:
       targetPort: 80
 ---
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: proxy-client-config
-data:
+stringData:
   config.yaml: |
     log_level: 2
     port: 80

env/base/runner-deployment.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: barretthousen-service
       containers:
         - name: runner
-          image: barretthousen/service-runner:prod
+          image: barretthousen/service-runner:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 5001
@@ -33,8 +33,8 @@ spec:
               name: runner-config
       volumes:
         - name: runner-config
-          configMap:
-            name: runner-config
+          secret:
+            secretName: runner-config
 ---
 apiVersion: v1
 kind: Service
@@ -49,10 +49,10 @@ spec:
 
 ---
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: runner-config
-data:
+stringData:
   config.yaml: |
     log_level: 2
     port: 5001

env/base/scrape-cronjob.yaml

@@ -18,7 +18,7 @@ spec:
               command:
                 [
                   "curl",
-                  "http://proxy-admin-local/api/v1/sync",
+                  "http://${PROXY_ADMIN_SERVICE_HOST}/api/v1/sync",
                   '-d=''{"target":"liveauctioneers"}''',
                   "-vvvv",
                 ]

env/base/web-client-deployment.yaml

@@ -14,7 +14,7 @@ spec:
       serviceAccountName: barretthousen-service
       containers:
         - name: web-client
-          image: barretthousen/service-web-client:prod
+          image: barretthousen/service-web-client:latest
           imagePullPolicy: Always
           stdin: true
           tty: true

env/beta/catalog-secret.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: catalog-config
+stringData:
+  config.yaml: |
+    log_level: 2
+    port: 5001
+    db_service:
+        scheme: postgres
+        port: 5432
+        host: bh-db
+        name: bh
+        user: catalog-service
+        password: catalog-service
+    db_migrate:
+        scheme: postgres
+        port: 5432
+        host: bh-db
+        name: bh
+        user: postgres
+        password: bh-admin-beta

env/beta/kustomization.yaml

@@ -7,10 +7,10 @@ namespace: barretthousen-beta
 
 patchesStrategicMerge:
   - scrape-cronjob.yaml
-  - catalog-configmap.yaml
-  - proxy-admin-configmap.yaml
-  - proxy-client-configmap.yaml
-  - runner-configmap.yaml
+  - catalog-secret.yaml
+  - proxy-admin-secret.yaml
+  - proxy-client-secret.yaml
+  - runner-secret.yaml
 
 patches:
   - target:

env/beta/proxy-admin-secret.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: proxy-admin-config
+stringData:
+  config.yaml: |
+    log_level: 2
+    port: 80
+    endpoints:
+      runner: runner-beta:5001

env/beta/proxy-client-secret.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: proxy-client-config
+stringData:
+  config.yaml: |
+    log_level: 2
+    port: 80
+    access_control_allow_origin: "beta.barretthousen.com"
+    endpoints:
+      catalog: catalog-beta:5001

env/beta/runner-secret.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: runner-config
+stringData:
+  config.yaml: |
+    log_level: 2
+    port: 5001
+    catalog_endpoint: catalog-beta:5001
+    db_service:
+        scheme: postgres
+        port: 5432
+        host: bh-db
+        name: bh
+        user: runner-service
+        password: runner-service
+    db_migrate:
+        scheme: postgres
+        port: 5432
+        host: bh-db
+        name: bh
+        user: postgres
+        password: bh-admin-beta

env/local/kustomization.yaml

@@ -10,6 +10,7 @@ namespace: barretthousen-local
 patchesStrategicMerge:
   - debug-catalog.yaml
   - debug-runner.yaml
+  - scrape-cronjob.yaml
   - image-pull-secret.yaml
 
 patches:

env/local/scrape-cronjob.yaml

@@ -0,0 +1,19 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: runner-sync
+spec:
+  schedule: "0 */2 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: runner-curl
+              command:
+                [
+                  "curl",
+                  "http://proxy-admin-local/api/v1/sync",
+                  '-d=''{"target":"liveauctioneers"}''',
+                  "-vvvv",
+                ]

env/prod/kustomization.yaml

@@ -0,0 +1,67 @@
+resources:
+  - ../base
+commonLabels:
+  environment: prod
+#nameSuffix: -prod
+namespace: barretthousen
+
+patchesStrategicMerge:
+  - scrape-cronjob.yaml
+  - catalog-configmap.yaml
+  - proxy-admin-configmap.yaml
+  - proxy-client-configmap.yaml
+  - runner-configmap.yaml
+
+patches:
+  - target:
+      kind: Ingress
+      name: admin
+    patch: |-
+      - op: replace
+        path: /spec/rules/0/host
+        value: admin.barretthousen.com
+  - target:
+      kind: Ingress
+      name: web
+    patch: |-
+      - op: replace
+        path: /spec/rules/0/host
+        value: barretthousen.com
+  - target:
+      kind: Deployment
+      name: catalog
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/image
+        value: git.vdhsn.com/barretthousen/service-catalog:prod
+  - target:
+      kind: Deployment
+      name: runner
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/image
+        value: git.vdhsn.com/barretthousen/service-runner:prod
+  - target:
+      kind: Deployment
+      name: proxy-admin
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/image
+        value: git.vdhsn.com/barretthousen/service-proxy-admin:prod
+  - target:
+      kind: Deployment
+      name: proxy-client
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/image
+        value: git.vdhsn.com/barretthousen/service-proxy-client:prod
+  - target:
+      kind: Deployment
+      name: web-client
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/image
+        value: git.vdhsn.com/barretthousen/client-web-client:prod
+      - op: replace
+        path: /spec/template/spec/containers/0/env/0/value
+        value: https://barretthousen.com

env/prod/scrape-cronjob.yaml

@@ -0,0 +1,19 @@
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: runner-sync
+spec:
+  schedule: "0 */2 * * *"
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+            - name: runner-curl
+              command:
+                [
+                  "curl",
+                  "http://proxy-admin/api/v1/sync",
+                  '-d=''{"target":"liveauctioneers"}''',
+                  "-vvvv",
+                ]