bunch of updates before big interview prep

11 months ago · 67d76a30ca
parent bd31e9ec35
commit 67d76a30ca
6 changed files with 66 additions and 96 deletions
--- a/43
+++ b/43
@ -3,6 +3,18 @@ KUBECONFIG = $(PWD)/.kubeconfig
 CLUSTER = $(shell kind get clusters | grep 'bh-local')
 GOBIN = $(shell go env GOPATH)/bin

+###################
+# Utilities
+###################
+
+.PHONY: setup
+setup: $(GOBIN)/sqlc $(GOBIN)/buf ./env/.age.txt
+	@asdf install || true
+
+.PHONY: gen
+gen: $(GOBIN)/sqlc buf.lock
+	@$(GOBIN)/sqlc generate -f ./src/sqlc.yaml
+	@cd ./src && $(GOBIN)/buf generate

 .PHONY: dev
 dev: .kubeconfig
@ -15,6 +27,19 @@ clobber:
 	@rm -f $(KUBECONFIG)


+.PHONY: acceptance-test
+acceptance-test:
+	docker run -it --rm \
+		-v $(pwd)/src/acceptance-tests.yml:/tests/tests.yml \
+		-e "TEST_HOST=bh.localhost" \
+		-e "TEST_ENV=local" \
+		nytimes/httptest
+
+
+##############################
+# Container Image Building
+##############################
+
 SERVICE = "catalog"
 ENV = ""
 ORIGIN = "https://barretthousen.com"
@ -59,24 +84,6 @@ build-backend-image:
 	@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(VERSION) || true
 	@[ ! -z $(ENV) ] && docker push git.vdhsn.com/barretthousen/service-$(SERVICE):$(ENV) || true

-.PHONY: acceptance-test
-acceptance-test:
-	docker run -it --rm \
-		-v $(pwd)/src/acceptance-tests.yml:/tests/tests.yml \
-		-e "TEST_HOST=bh.localhost" \
-		-e "TEST_ENV=local" \
-		nytimes/httptest
-
-.PHONY: gen
-gen: $(GOBIN)/sqlc buf.lock
-	@$(GOBIN)/sqlc generate -f ./src/sqlc.yaml
-	@cd ./src && $(GOBIN)/buf generate
-
-
-.PHONY: setup
-setup: $(GOBIN)/sqlc $(GOBIN)/buf ./env/.age.txt
-	@asdf install || true
-	@docker login git.vdhsn.com

 buf.lock: $(GOBIN)/buf
 	@$(GOBIN)/buf mod update ./src
--- a/76
+++ b/76
@ -12,7 +12,6 @@ helm_repo('bitnami', 'https://charts.bitnami.com/bitnami', labels=["9-repos"])
 helm_repo('traefik', 'https://traefik.github.io/charts', labels=["9-repos"])
 helm_repo('grafana', 'https://grafana.github.io/helm-charts', labels=["9-repos"])

-
 helm_resource(
    'ingress',
    'traefik/traefik',
@ -47,15 +46,25 @@ helm_resource(
        '--set', 'auth.postgresPassword=bh-admin',
        '--set', 'auth.database=bh',
    ],
-    port_forwards=[
-        port_forward(5432, 5432, name='BH DB')],
+    port_forwards=[port_forward(5432, 5432, name='BH DB')],
    resource_deps=['bitnami'],
-    labels=["9-data"])
+    labels=["9-data"]
+)

-k8s_yaml(
-    kustomize("./env/local")
+helm_resource(
+    'kafka',
+    'bitnami/kafka',
+    namespace='barretthousen-local',
+    flags=[
+        '--set', 'numIoThreads=1',
+        '--set', 'numNetworkThreads=1',
+    ],
+    port_forwards=[port_forward(9092, 9092, name='kafka')],
+    resource_deps=['bitnami'],
+    labels=["9-data"]
 )

+
 def bh_backend_service(service="", port_forwards=[], migrateDB=False, devMode=True, labels=['2-services'], deps=['postgres']):
    local_resource(
        '{}-go-compile'.format(service),
@ -114,6 +123,28 @@ def bh_backend_service(service="", port_forwards=[], migrateDB=False, devMode=Tr
    )


+k8s_yaml(
+    kustomize("./env/local")
+)
+
+k8s_resource(
+    workload='runner-sync-local',
+    labels='2-services'
+)
+
+docker_build(
+    ref='barretthousen/service-web-client',
+    context='./src/web-client',
+    dockerfile='./src/web-client/Dockerfile.dev-frontend',
+    target='development'
+)
+k8s_resource(
+    workload='web-client-local',
+    port_forwards=['8080:80'],
+    labels=['2-services'],
+    resource_deps=['ingress']
+)
+

 bh_backend_service(service="runner", migrateDB=True, port_forwards=[
    port_forward(2345, name='Delve port')
@ -131,27 +162,9 @@ bh_backend_service(service="proxy-client", port_forwards=[
    port_forward(8081, 80, name="HTTP API @ localhost:8081")
 ], deps=['ingress'])

-docker_build(
-    ref='barretthousen/service-web-client',
-    context='./src/web-client',
-    dockerfile='./src/web-client/Dockerfile.dev-frontend',
-    target='development'
-)
-k8s_resource(
-    workload='web-client-local',
-    port_forwards=['8080:80'],
-    labels=['2-services'],
-    resource_deps=['ingress']
-)
-
-
-k8s_resource(
-    workload='runner-sync-local',
-    labels='2-services'
-)

 # local_resource(
-#     'web-client',
+#     'dev-web-client',
 #     dir='./src/web-client',
 #     cmd='npm i',
 #     serve_dir='./src/web-client',
@ -168,16 +181,3 @@ k8s_resource(
 #     ],
 #     labels=['2-services']
 # )
-
-
-# helm_resource(
-#     'loki-stack',
-#     'grafana/loki-stack',
-#     resource_deps=['grafana'],
-#     flags=[
-#         '--set', 'fluent-bit.enabled=false',
-#         '--set', 'promtail.enabled=false',
-#         '--set', 'loki.enabled=false',
-#     ],
-#     port_forwards=["3000:80"],
-#     labels=["9-monitoring"])
--- a/env/base/image-pull-secret.yaml
+++ b/env/base/image-pull-secret.yaml
@ -4,24 +4,5 @@ metadata:
    name: bh-registry
 type: kubernetes.io/dockerconfigjson
 stringData:
-    .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
+    .dockerconfigjson: |
+        { "auths": {} }
--- a/env/local/image-pull-secret.yaml
+++ b/env/local/image-pull-secret.yaml
@ -1,8 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-    name: bh-registry
-type: kubernetes.io/dockerconfigjson
-stringData:
-    .dockerconfigjson: |
-        { "auths": {} }
--- a/env/local/kustomization.yaml
+++ b/env/local/kustomization.yaml
@ -11,7 +11,6 @@ patchesStrategicMerge:
  - debug-catalog.yaml
  - debug-runner.yaml
  - scrape-cronjob.yaml
-  - image-pull-secret.yaml

 patches:
  - target:
--- a/src/web-client/package-lock.json
+++ b/src/web-client/package-lock.json
@ -8,8 +8,7 @@
 			"name": "web-client",
 			"version": "0.0.1",
 			"dependencies": {
-				"luxon": "^3.3.0",
-				"moment": "^2.29.4"
+				"luxon": "^3.3.0"
 			},
 			"devDependencies": {
 				"@playwright/test": "^1.28.1",
@ -2703,14 +2702,6 @@
 				"mkdirp": "bin/cmd.js"
 			}
 		},
-		"node_modules/moment": {
-			"version": "2.29.4",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
-			"engines": {
-				"node": "*"
-			}
-		},
 		"node_modules/mri": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",