From 8d845dac54afcb533f77e4eb4cf3a694462bd847 Mon Sep 17 00:00:00 2001 From: Matthew Walter Date: Fri, 19 Apr 2019 15:40:47 -0400 Subject: [PATCH] Kustomize all the things --- .../kube-lego/{ => base}/configmap.yaml | 1 - .../kube-lego/{ => base}/deployment.yaml | 1 - kubernetes/kube-lego/base/kustomization.yaml | 7 + kubernetes/kube-lego/{ => base}/rbac.yaml | 1 - .../overlays/prod/kustomization.yaml | 7 + .../base/deployment.yaml | 0 .../base/kustomization.yaml | 0 .../base/service.yaml | 0 .../database-service-prod.yml | 8 - .../database-service-stage.yml | 8 - .../operationcode_backend/deployment.yml | 185 ------------------ .../overlays/prod/database-service.yaml | 0 .../overlays/prod/ingress.yaml | 0 .../overlays/prod/kustomization.yaml | 0 .../overlays/prod/redis-service.yaml | 0 .../overlays/staging/database-service.yaml | 0 .../overlays/staging/deployment.yaml | 0 .../overlays/staging/ingress.yaml | 0 .../overlays/staging/kustomization.yaml | 0 .../overlays/staging/redis-service.yaml | 0 .../redis-service-stage.yml | 12 -- kubernetes/operationcode_backend/service.yml | 13 -- .../staging/ingress.yaml | 21 -- .../town_crier/{ => base}/deployment.yml | 3 - kubernetes/town_crier/base/kustomization.yaml | 5 + .../overlays/prod/kustomization.yaml | 7 + 26 files changed, 26 insertions(+), 253 deletions(-) rename kubernetes/kube-lego/{ => base}/configmap.yaml (93%) rename kubernetes/kube-lego/{ => base}/deployment.yaml (97%) create mode 100644 kubernetes/kube-lego/base/kustomization.yaml rename kubernetes/kube-lego/{ => base}/rbac.yaml (97%) create mode 100644 kubernetes/kube-lego/overlays/prod/kustomization.yaml rename kubernetes/{argo-test => operationcode_backend}/base/deployment.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/base/kustomization.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/base/service.yaml (100%) delete mode 100644 kubernetes/operationcode_backend/database-service-prod.yml delete mode 100644 kubernetes/operationcode_backend/database-service-stage.yml delete mode 100644 kubernetes/operationcode_backend/deployment.yml rename kubernetes/{argo-test => operationcode_backend}/overlays/prod/database-service.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/prod/ingress.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/prod/kustomization.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/prod/redis-service.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/staging/database-service.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/staging/deployment.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/staging/ingress.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/staging/kustomization.yaml (100%) rename kubernetes/{argo-test => operationcode_backend}/overlays/staging/redis-service.yaml (100%) delete mode 100644 kubernetes/operationcode_backend/redis-service-stage.yml delete mode 100644 kubernetes/operationcode_backend/service.yml delete mode 100644 kubernetes/operationcode_backend/staging/ingress.yaml rename kubernetes/town_crier/{ => base}/deployment.yml (90%) create mode 100644 kubernetes/town_crier/base/kustomization.yaml create mode 100644 kubernetes/town_crier/overlays/prod/kustomization.yaml diff --git a/kubernetes/kube-lego/configmap.yaml b/kubernetes/kube-lego/base/configmap.yaml similarity index 93% rename from kubernetes/kube-lego/configmap.yaml rename to kubernetes/kube-lego/base/configmap.yaml index 8e51d4c..8f220f0 100644 --- a/kubernetes/kube-lego/configmap.yaml +++ b/kubernetes/kube-lego/base/configmap.yaml @@ -1,7 +1,6 @@ apiVersion: v1 metadata: name: kube-lego - namespace: kube-lego data: # modify this to specify your address lego.email: "tech@operationcode.org" diff --git a/kubernetes/kube-lego/deployment.yaml b/kubernetes/kube-lego/base/deployment.yaml similarity index 97% rename from kubernetes/kube-lego/deployment.yaml rename to kubernetes/kube-lego/base/deployment.yaml index 71a97ac..c4e099c 100644 --- a/kubernetes/kube-lego/deployment.yaml +++ b/kubernetes/kube-lego/base/deployment.yaml @@ -2,7 +2,6 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: kube-lego - namespace: kube-lego spec: replicas: 1 template: diff --git a/kubernetes/kube-lego/base/kustomization.yaml b/kubernetes/kube-lego/base/kustomization.yaml new file mode 100644 index 0000000..5958ee9 --- /dev/null +++ b/kubernetes/kube-lego/base/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- configmap.yaml +- deployment.yaml +- rbac.yaml diff --git a/kubernetes/kube-lego/rbac.yaml b/kubernetes/kube-lego/base/rbac.yaml similarity index 97% rename from kubernetes/kube-lego/rbac.yaml rename to kubernetes/kube-lego/base/rbac.yaml index f3594b5..92a1aba 100644 --- a/kubernetes/kube-lego/rbac.yaml +++ b/kubernetes/kube-lego/base/rbac.yaml @@ -38,4 +38,3 @@ roleRef: subjects: - kind: ServiceAccount name: default - namespace: lego diff --git a/kubernetes/kube-lego/overlays/prod/kustomization.yaml b/kubernetes/kube-lego/overlays/prod/kustomization.yaml new file mode 100644 index 0000000..8bae283 --- /dev/null +++ b/kubernetes/kube-lego/overlays/prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: kube-lego + +bases: +- ../../base diff --git a/kubernetes/argo-test/base/deployment.yaml b/kubernetes/operationcode_backend/base/deployment.yaml similarity index 100% rename from kubernetes/argo-test/base/deployment.yaml rename to kubernetes/operationcode_backend/base/deployment.yaml diff --git a/kubernetes/argo-test/base/kustomization.yaml b/kubernetes/operationcode_backend/base/kustomization.yaml similarity index 100% rename from kubernetes/argo-test/base/kustomization.yaml rename to kubernetes/operationcode_backend/base/kustomization.yaml diff --git a/kubernetes/argo-test/base/service.yaml b/kubernetes/operationcode_backend/base/service.yaml similarity index 100% rename from kubernetes/argo-test/base/service.yaml rename to kubernetes/operationcode_backend/base/service.yaml diff --git a/kubernetes/operationcode_backend/database-service-prod.yml b/kubernetes/operationcode_backend/database-service-prod.yml deleted file mode 100644 index 28cde8f..0000000 --- a/kubernetes/operationcode_backend/database-service-prod.yml +++ /dev/null @@ -1,8 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: opcode-postgres - namespace: operationcode -spec: - type: ExternalName - externalName: prod-postgres-20180107.czwauqf3tjaz.us-east-2.rds.amazonaws.com diff --git a/kubernetes/operationcode_backend/database-service-stage.yml b/kubernetes/operationcode_backend/database-service-stage.yml deleted file mode 100644 index 01f1dde..0000000 --- a/kubernetes/operationcode_backend/database-service-stage.yml +++ /dev/null @@ -1,8 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: opcode-postgres - namespace: operationcode-staging -spec: - type: ExternalName - externalName: staging-postgres-20180408.czwauqf3tjaz.us-east-2.rds.amazonaws.com diff --git a/kubernetes/operationcode_backend/deployment.yml b/kubernetes/operationcode_backend/deployment.yml deleted file mode 100644 index a6ffe5e..0000000 --- a/kubernetes/operationcode_backend/deployment.yml +++ /dev/null @@ -1,185 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: operationcode-backend -spec: - replicas: 2 - revisionHistoryLimit: 5 - template: - metadata: - labels: - app: operationcode-backend - spec: - containers: - - name: app - image: operationcode/operationcode_backend:latest - imagePullPolicy: Always - ports: - - containerPort: 3000 - env: - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: backend-secrets - key: postgres_password - - name: AIRTABLE_API_KEY - valueFrom: - secretKeyRef: - name: backend-secrets - key: airtable_api_key - - name: SLACK_LEGACY_ADMIN_TOKEN - valueFrom: - secretKeyRef: - name: backend-secrets - key: slack_legacy_admin_token - - name: AIRTABLE_BASE_ID - valueFrom: - secretKeyRef: - name: backend-secrets - key: airtable_base_id - - name: GIT_HUB_CLIENT_ID - valueFrom: - secretKeyRef: - name: backend-secrets - key: git_hub_client_id - - name: GIT_HUB_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: backend-secrets - key: git_hub_client_secret - - name: GIT_HUB_OAUTH_TOKEN - valueFrom: - secretKeyRef: - name: backend-secrets - key: git_hub_oauth_token - - name: PY_BOT_AUTH_KEY - valueFrom: - secretKeyRef: - name: backend-secrets - key: py_bot_auth_key - - name: POSTGRES_HOST - value: opcode-postgres - - name: REDIS_URL - value: redis://opcode-redis:6379/0 - - name: RAILS_ENV - value: production - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: backend-secrets - key: postgres_user - - name: SLACK_SUBDOMAIN - valueFrom: - secretKeyRef: - name: backend-secrets - key: slack_subdomain - - name: SLACK_TOKEN - valueFrom: - secretKeyRef: - name: backend-secrets - key: slack_token - - name: JWT_SECRET_KEY - valueFrom: - secretKeyRef: - name: backend-secrets - key: jwt_secret_key - - name: SECRET_KEY_BASE - valueFrom: - secretKeyRef: - name: backend-secrets - key: secret_key_base - - name: SKYLIGHT_AUTHENTICATION - valueFrom: - secretKeyRef: - name: backend-secrets - key: skylight_authentication - - name: SENTRY_CREDENTIALS - valueFrom: - secretKeyRef: - key: sentry_credentials - name: backend-secrets - - name: SENDGRID_PASSWORD - valueFrom: - secretKeyRef: - name: backend-secrets - key: sendgrid_password - - name: SENDGRID_USERNAME - valueFrom: - secretKeyRef: - name: backend-secrets - key: sendgrid_username - - name: SLACK_SERVICE_AUTH_TOKEN - valueFrom: - secretKeyRef: - key: slack_service_auth_token - name: backend-secrets - - name: operationcode-sidekiq - image: operationcode/operationcode_backend:latest - command: ["sidekiq", "-C config/sidekiq.yml.erb"] - imagePullPolicy: Always - env: - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: backend-secrets - key: postgres_password - - name: POSTGRES_USER - valueFrom: - secretKeyRef: - name: backend-secrets - key: postgres_user - - name: POSTGRES_HOST - value: opcode-postgres - - name: REDIS_URL - value: redis://opcode-redis:6379/0 - - name: SLACK_SUBDOMAIN - valueFrom: - secretKeyRef: - name: backend-secrets - key: slack_subdomain - - name: SLACK_LEGACY_ADMIN_TOKEN - valueFrom: - secretKeyRef: - name: backend-secrets - key: slack_legacy_admin_token - - name: SLACK_TOKEN - valueFrom: - secretKeyRef: - name: backend-secrets - key: slack_token - - name: SENDGRID_PASSWORD - valueFrom: - secretKeyRef: - name: backend-secrets - key: sendgrid_password - - name: SENDGRID_USERNAME - valueFrom: - secretKeyRef: - name: backend-secrets - key: sendgrid_username - - name: RAILS_ENV - value: production - - name: SENTRY_CREDENTIALS - valueFrom: - secretKeyRef: - key: sentry_credentials - name: backend-secrets - - name: SLACK_SERVICE_AUTH_TOKEN - valueFrom: - secretKeyRef: - key: slack_service_auth_token - name: backend-secrets - - name: JWT_SECRET_KEY - valueFrom: - secretKeyRef: - name: backend-secrets - key: jwt_secret_key - - name: SECRET_KEY_BASE - valueFrom: - secretKeyRef: - name: backend-secrets - key: secret_key_base - volumes: - - name: backend-secrets - secret: - secretName: backend-secrets diff --git a/kubernetes/argo-test/overlays/prod/database-service.yaml b/kubernetes/operationcode_backend/overlays/prod/database-service.yaml similarity index 100% rename from kubernetes/argo-test/overlays/prod/database-service.yaml rename to kubernetes/operationcode_backend/overlays/prod/database-service.yaml diff --git a/kubernetes/argo-test/overlays/prod/ingress.yaml b/kubernetes/operationcode_backend/overlays/prod/ingress.yaml similarity index 100% rename from kubernetes/argo-test/overlays/prod/ingress.yaml rename to kubernetes/operationcode_backend/overlays/prod/ingress.yaml diff --git a/kubernetes/argo-test/overlays/prod/kustomization.yaml b/kubernetes/operationcode_backend/overlays/prod/kustomization.yaml similarity index 100% rename from kubernetes/argo-test/overlays/prod/kustomization.yaml rename to kubernetes/operationcode_backend/overlays/prod/kustomization.yaml diff --git a/kubernetes/argo-test/overlays/prod/redis-service.yaml b/kubernetes/operationcode_backend/overlays/prod/redis-service.yaml similarity index 100% rename from kubernetes/argo-test/overlays/prod/redis-service.yaml rename to kubernetes/operationcode_backend/overlays/prod/redis-service.yaml diff --git a/kubernetes/argo-test/overlays/staging/database-service.yaml b/kubernetes/operationcode_backend/overlays/staging/database-service.yaml similarity index 100% rename from kubernetes/argo-test/overlays/staging/database-service.yaml rename to kubernetes/operationcode_backend/overlays/staging/database-service.yaml diff --git a/kubernetes/argo-test/overlays/staging/deployment.yaml b/kubernetes/operationcode_backend/overlays/staging/deployment.yaml similarity index 100% rename from kubernetes/argo-test/overlays/staging/deployment.yaml rename to kubernetes/operationcode_backend/overlays/staging/deployment.yaml diff --git a/kubernetes/argo-test/overlays/staging/ingress.yaml b/kubernetes/operationcode_backend/overlays/staging/ingress.yaml similarity index 100% rename from kubernetes/argo-test/overlays/staging/ingress.yaml rename to kubernetes/operationcode_backend/overlays/staging/ingress.yaml diff --git a/kubernetes/argo-test/overlays/staging/kustomization.yaml b/kubernetes/operationcode_backend/overlays/staging/kustomization.yaml similarity index 100% rename from kubernetes/argo-test/overlays/staging/kustomization.yaml rename to kubernetes/operationcode_backend/overlays/staging/kustomization.yaml diff --git a/kubernetes/argo-test/overlays/staging/redis-service.yaml b/kubernetes/operationcode_backend/overlays/staging/redis-service.yaml similarity index 100% rename from kubernetes/argo-test/overlays/staging/redis-service.yaml rename to kubernetes/operationcode_backend/overlays/staging/redis-service.yaml diff --git a/kubernetes/operationcode_backend/redis-service-stage.yml b/kubernetes/operationcode_backend/redis-service-stage.yml deleted file mode 100644 index ec98b61..0000000 --- a/kubernetes/operationcode_backend/redis-service-stage.yml +++ /dev/null @@ -1,12 +0,0 @@ -kind: Service -apiVersion: v1 -metadata: - name: opcode-redis - namespace: operationcode-staging -spec: - selector: - app: operationcode-staging-redis-redis - ports: - - protocol: TCP - port: 6379 - targetPort: 6379 diff --git a/kubernetes/operationcode_backend/service.yml b/kubernetes/operationcode_backend/service.yml deleted file mode 100644 index 1e1b6db..0000000 --- a/kubernetes/operationcode_backend/service.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: operationcode-backend-service -spec: - selector: - app: operationcode-backend - ports: - - protocol: TCP - name: http - port: 80 - targetPort: 3000 - type: ClusterIP diff --git a/kubernetes/operationcode_backend/staging/ingress.yaml b/kubernetes/operationcode_backend/staging/ingress.yaml deleted file mode 100644 index c4356ac..0000000 --- a/kubernetes/operationcode_backend/staging/ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: nginx - kubernetes.io/tls-acme: "true" - name: operationcode-backend - namespace: operationcode-staging -spec: - rules: - - host: api.staging.operationcode.org - http: - paths: - - backend: - serviceName: operationcode-backend-service - servicePort: 80 - path: / - tls: - - hosts: - - api.staging.operationcode.org - secretName: operationcode-backend-tls diff --git a/kubernetes/town_crier/deployment.yml b/kubernetes/town_crier/base/deployment.yml similarity index 90% rename from kubernetes/town_crier/deployment.yml rename to kubernetes/town_crier/base/deployment.yml index 4cf3c29..4d1e545 100644 --- a/kubernetes/town_crier/deployment.yml +++ b/kubernetes/town_crier/base/deployment.yml @@ -30,9 +30,6 @@ spec: secretKeyRef: name: town-crier-secrets key: slack_token - volumeMounts: - - name: town-crier-secrets - mountPath: /run/secrets volumes: - name: town-crier-secrets secret: diff --git a/kubernetes/town_crier/base/kustomization.yaml b/kubernetes/town_crier/base/kustomization.yaml new file mode 100644 index 0000000..0c00d6f --- /dev/null +++ b/kubernetes/town_crier/base/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- deployment.yaml diff --git a/kubernetes/town_crier/overlays/prod/kustomization.yaml b/kubernetes/town_crier/overlays/prod/kustomization.yaml new file mode 100644 index 0000000..4e914dc --- /dev/null +++ b/kubernetes/town_crier/overlays/prod/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: operationcode + +bases: +- ../../base