updates for deployment

11 months ago · b40498b6ea
parent dc4fe8851f
commit b40498b6ea
14 changed files with 115 additions and 82 deletions
--- a/3
+++ b/3
@ -57,9 +57,10 @@ build-client-image:
 		--label 'com.barretthousen.build-date=$(BUILD_DATE)' \
 		--label 'com.barrethousen.builder=$(BUILD_INITIATOR)' \
 		--build-arg 'origin=$(ORIGIN)' \
+		--build-arg 'service=$(SERVICE)' \
 		-t barretthousen/client-$(SERVICE):$(VERSION) \
 		-t git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) \
-		-f ./src/$(SERVICE)/Dockerfile.frontend ./src/$(SERVICE)
+		-f ./src/Dockerfile.frontend ./src/$(SERVICE)

 	@[ ! -z $(ENV) ] && docker tag git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) git.vdhsn.com/barretthousen/client-$(SERVICE):$(ENV) || true
 	@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/client-$(SERVICE):$(VERSION) || true
--- a/2
+++ b/2
@ -82,7 +82,7 @@ def bh_client(service="", port_forwards=[], labels=['2-services'], deps=['ingres
    docker_build(
        ref='barretthousen/client-{}-client'.format(service),
        context=basepath,
-        dockerfile=basepath +'/Dockerfile.dev-frontend'.format(service),
+        dockerfile='./src/Dockerfile.frontend'.format(service),
        target='development',
        entrypoint='vite dev --port=80 --host=0.0.0.0 --strictPort --logLevel info',
        live_update=[
--- a/doc/deployment.md
+++ b/doc/deployment.md
@ -6,7 +6,9 @@ Services deployed (using kustomize):
 - [runner](./src/runner)
 - [proxy-admin](./src/proxy-admin)
 - [proxy-client](./src/proxy-client)
+
 - [web-client](./src/web-client)
+- [admin-client](./src/admin-client)


 Platform components deployed (using helm):
@ -56,12 +58,13 @@ helm install --upgrade bh-db bitnami/postgresql -n 'barretthousen-beta' \

 1. Build and publish prod images
 ```sh
-make build-backend-image SERVICE=catalog env=beta
-make build-backend-image SERVICE=runner env=beta
-make build-backend-image SERVICE=proxy-admin env=beta
-make build-backend-image SERVICE=proxy-client env=beta
+make build-backend-image SERVICE=catalog ENV=beta
+make build-backend-image SERVICE=runner ENV=beta
+make build-backend-image SERVICE=proxy-admin ENV=beta
+make build-backend-image SERVICE=proxy-client ENV=beta

-make build-client-image SERVICE=web-client env=beta
+make build-client-image SERVICE=web-client ENV=beta ORIGIN=https://beta.barretthousen.com
+make build-client-image SERVICE=admin-client ENV=beta ORIGIN=https://beta.admin.barretthousen.com
 ```

 2. Rolling restart deployments in the beta env
@ -80,9 +83,7 @@ kubectl rollout status -n barretthousen-beta deployment proxy-client-beta -w

 kubectl rollout restart -n barretthousen-beta deployment web-client-beta
 kubectl rollout status -n barretthousen-beta deployment web-client-beta -w
-```
-

-## Prod
-
-TBD
+kubectl rollout restart -n barretthousen-beta deployment admin-client-beta
+kubectl rollout status -n barretthousen-beta deployment admin-client-beta -w
+```
--- a/env/base/image-pull-secret.yaml
+++ b/env/base/image-pull-secret.yaml
@ -4,5 +4,24 @@ metadata:
    name: bh-registry
 type: kubernetes.io/dockerconfigjson
 stringData:
-    .dockerconfigjson: |
-        { "auths": {} }
+    .dockerconfigjson: ENC[AES256_GCM,data:bfqlh7Vy3HDYFtgv56xO+8lXOLO9bQWRC16N8hAzv6xJaIN6CmXDwFzoLoGWPrP9s/o446tuOEJEylf5z/ITnLtdGJgMsN13Xk7OiF9B2unV8yOOrzt6U6R2s5cFpbSL3tAHQmDKHxRrzbvyV2J3magen7oHQWbkwkOQq7FqV/k7wFly+bei1u+YLJ9hq798Xa5HG9j4LsVWi5izKt1BBss2xFlo3yzEFqNmQ+AzcUN1uK1xwStplK4IKC36rewONDS+yyqj830LLShb,iv:qDwYxBqK+ZamBcWEuF+UEfW8gLFROagaBqVAc1tCjUI=,tag:OYhChcvisxP0r3kQ4hq4SA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1d5vst0g82v6xml29ydsrxefmf3vclgm6dj3npw6mefa7yu9xueaqztjqlg
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaRG1ERkdkTXMvUllCSHdS
+            TXVBVWNMd0hYeXMvTXh6OFVTYXV0MkVoOEJ3Ck9XakJTbHMyTWpvazFzYUtNcmtx
+            NTVoVnUwWkpKYjg4MWs1dmxpT3JGRFUKLS0tIHdHRk8yL1lCRk9DM0haYjN4Z1Ry
+            d25rRklvOUdLQlU0S2l0WXBpUXhyR2MKQgJXQgxp0T2rr0V2NjwSjWFlzNyig5vW
+            S8PW6OpCOyfMqzz5NWTdUVymY7UEdAguwZH+MY2DdvEn3NM/TcnRwA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2023-05-27T02:48:45Z"
+    mac: ENC[AES256_GCM,data:SCjcJPn7hg9sUFYlOUKAVJBXKNIrcz/x3aqyX43xf7UO7Zo/pGDp1JDaKA7lCaKTgPEAe1zRRv6LjejNGX3DlpmxMS6o2xaI3nb0e0CnLj9t9t57L5svrciwh9wOennWj26DirgzAB+uqCJ/NGOJh4S8yTPOF5MgBNkqNw6FN94=,iv:YTtckdYzKnBBqbQYvjw9FpvGHsUxX6MnAeNopYhFe7I=,tag:BPUitJtY65JbnanHJgJatg==,type:str]
+    pgp: []
+    encrypted_regex: ^(data|stringData)$
+    version: 3.7.3
--- a/env/base/sync-cronjob.yaml
+++ b/env/base/sync-cronjob.yaml
@ -3,7 +3,7 @@ kind: CronJob
 metadata:
  name: runner-sync
 spec:
-  schedule: "*/2 * * * *"
+  schedule: "0 * * * *"
  jobTemplate:
    spec:
      template:
--- a/env/beta/kustomization.yaml
+++ b/env/beta/kustomization.yaml
@ -19,7 +19,7 @@ patches:
    patch: |-
      - op: replace
        path: /spec/rules/0/host
-        value: admin.beta.barretthousen.com
+        value: beta.admin.barretthousen.com
  - target:
      kind: Ingress
      name: web
@ -41,6 +41,7 @@ patches:
      - op: replace
        path: /spec/template/spec/containers/0/image
        value: git.vdhsn.com/barretthousen/service-runner:beta
+
  - target:
      kind: Deployment
      name: proxy-admin
@ -48,6 +49,17 @@ patches:
      - op: replace
        path: /spec/template/spec/containers/0/image
        value: git.vdhsn.com/barretthousen/service-proxy-admin:beta
+  - target:
+      kind: Deployment
+      name: admin-client
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/containers/0/image
+        value: git.vdhsn.com/barretthousen/client-admin-client:beta
+      - op: replace
+        path: /spec/template/spec/containers/0/env/0/value
+        value: https://beta.admin.barretthousen.com
+
  - target:
      kind: Deployment
      name: proxy-client
--- a/env/local/kustomization.yaml
+++ b/env/local/kustomization.yaml
@ -13,13 +13,6 @@ patchesStrategicMerge:
  - sync-cronjob.yaml

 patches:
-  - target:
-      kind: CronJob
-      name: runner-sync
-    patch: |-
-      - op: replace
-        path: /spec/schedule
-        value: "* * * * *"
  - target:
      kind: Ingress
      name: admin
--- a/src/Dockerfile.dev-backend
+++ b/src/Dockerfile.dev-backend
@ -1,4 +1,4 @@
-FROM golang:1.19-alpine as builder
+FROM golang:1.19-alpine as dev-builder

 ARG service

@ -8,7 +8,7 @@ FROM alpine as development

 ARG service

-COPY --from=builder /go/bin/dlv /go/bin/dlv
+COPY --from=dev-builder /go/bin/dlv /go/bin/dlv
 COPY .bin/${service}-debug /opt/
 COPY ./src /go/src/

--- a/src/Dockerfile.frontend
+++ b/src/Dockerfile.frontend
@ -0,0 +1,59 @@
+FROM node:lts AS development
+
+ARG service
+
+COPY . /opt/${service}
+
+WORKDIR /opt/${service}
+
+RUN npm install && npm install -g vite
+
+CMD vite dev --port=80 --host=0.0.0.0 --strictPort --logLevel info
+
+FROM node:lts AS build
+
+ARG service
+
+ARG origin=https://admin.barretthousen.com
+
+ENV PROTOCOL_HEADER=x-forwarded-proto
+ENV HOST_HEADER=x-forwarded-host
+ENV ORIGIN=${origin}
+
+WORKDIR /opt/${service}
+
+COPY . /opt/${service}
+
+RUN npm ci && npm run build \
+	&& cp -v /opt/${service}/package.json /opt/${service}/build \
+	&& cp -v /opt/${service}/package-lock.json /opt/${service}/build \
+	&& cd /opt/${service}/build && npm ci --omit dev
+
+FROM node:lts AS production
+
+ARG service
+
+LABEL com.barretthousen.service=${service}
+LABEL com.barretthousen.tags="frontend,public"
+LABEL com.barretthousen.release-date="2023-05-01"
+LABEL com.barretthousen.version="alpha-0.0.1"
+LABEL com.barretthousen.git-ref="000000000000000000000000000000000000000000000000"
+
+ARG origin=https://admin.barretthousen.com
+
+ENV ENV=production
+ENV PROTOCOL_HEADER=x-forwarded-proto
+ENV HOST_HEADER=x-forwarded-host
+ENV SERVICE=${service}
+ENV ORIGIN=${origin}
+
+WORKDIR /opt
+
+COPY --from=build /opt/${service}/build/ /opt/${service}/
+
+ENV PORT 80
+
+EXPOSE 80
+
+ENTRYPOINT ["node", ${SERVICE}]
+
--- a/src/Dockerfile.prod-backend
+++ b/src/Dockerfile.prod-backend
@ -1,5 +1,4 @@
-FROM golang:1.19 as builder
-
+FROM golang:1.19 as prod-builder

 RUN go install github.com/bufbuild/buf/cmd/buf@v1.17.0
 RUN go install github.com/kyleconroy/sqlc/cmd/sqlc@latest
@ -22,7 +21,7 @@ FROM alpine as production

 ARG service

-COPY --from=builder /opt/${service} /opt/${service}
+COPY --from=prod-builder /opt/${service} /opt/${service}

 ENV SERVICE=${SERVICE}

--- a/src/admin-client/Dockerfile.dev-frontend
+++ b/src/admin-client/Dockerfile.dev-frontend
@ -1,9 +0,0 @@
-FROM node:lts AS development
-
-COPY . /opt/admin-client
-
-WORKDIR /opt/admin-client
-
-RUN npm install && npm install -g vite
-
-CMD vite dev --port=80 --host=0.0.0.0 --strictPort --logLevel info
--- a/src/admin-client/Dockerfile.frontend
+++ b/src/admin-client/Dockerfile.frontend
@ -1,42 +0,0 @@
-FROM node:lts AS build
-
-ARG origin=https://barretthousen.com
-
-ENV PROTOCOL_HEADER=x-forwarded-proto
-ENV HOST_HEADER=x-forwarded-host
-ENV ORIGIN=${origin}
-
-WORKDIR /opt/admin-client
-
-COPY . /opt/admin-client
-
-RUN npm run build \
-	&& cp -v /opt/admin-client/package.json /opt/admin-client/build \
-	&& cp -v /opt/admin-client/package-lock.json /opt/admin-client/build \
-	&& cd /opt/admin-client/build && npm ci --omit dev
-
-FROM node:lts AS production
-
-LABEL com.barretthousen.service="admin-client"
-LABEL com.barretthousen.tags="frontend,public"
-LABEL com.barretthousen.release-date="2023-05-01"
-LABEL com.barretthousen.version="alpha-0.0.1"
-LABEL com.barretthousen.git-ref="000000000000000000000000000000000000000000000000"
-
-ARG origin=https://barretthousen.com
-
-ENV ENV=production
-ENV PROTOCOL_HEADER=x-forwarded-proto
-ENV HOST_HEADER=x-forwarded-host
-ENV ORIGIN=${origin}
-
-WORKDIR /opt
-
-COPY --from=build /opt/admin-client/build/ /opt/admin-client/
-
-ENV PORT 80
-
-EXPOSE 80
-
-ENTRYPOINT ["node", "admin-client"]
-
--- a/src/buf.lock
+++ b/src/buf.lock
@ -9,5 +9,5 @@ deps:
  - remote: buf.build
    owner: grpc-ecosystem
    repository: grpc-gateway
-    commit: a1ecdc58eccd49aa8bea2a7a9022dc27
-    digest: shake256:efdd86fbdc42e8b7259fe461a49656827a03fb7cba0b3b9eb622ca10654ec6beccb9a051229c1553ccd89ed3e95d69ad4d7c799f1da3f3f1bd447b7947a4893e
+    commit: 11c9972ea0fd4c95a2c38d29bb1dc817
+    digest: shake256:9c7ce822dff52ad28714465396fbe98e879409677a61687b7dd9bb3d1484aa5d1704c013698b24f34c5d51023dbff47287ecd9676271953c25e646b42ebb76c5
--- a/src/web-client/Dockerfile.frontend
+++ b/src/web-client/Dockerfile.frontend
@ -10,7 +10,7 @@ WORKDIR /opt/web-client

 COPY . /opt/web-client

-RUN npm run build \
+RUN npm ci && npm run build \
 	&& cp -v /opt/web-client/package.json /opt/web-client/build \
 	&& cp -v /opt/web-client/package-lock.json /opt/web-client/build \
 	&& cd /opt/web-client/build && npm ci --omit dev