chore(deps): update hasura/graphql-engine docker tag to v2.25.1

.dockerignore

@@ -1 +1 @@
-charts
+helm/

.github/workflows/pr-close.yaml

@@ -0,0 +1,12 @@
+name: pr-close
+on:
+  pull_request:
+    types: [ closed ]
+
+jobs:
+
+  preview-cleanup:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/gitops-preview-cleanup.yaml@main
+    secrets: inherit
+    with:
+      environment_repository: CloudNativeEntrepreneur/example-preview-envs

.github/workflows/pr.yaml

@@ -0,0 +1,45 @@
+name: pr
+
+on:
+
+  pull_request:
+    branches:
+      - main
+
+jobs:
+
+  helm-quality:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/helm-quality.yaml@main
+    with:
+      helm_path: helm
+
+  preview-helm-quality:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/helm-quality.yaml@main
+    with:
+      helm_path: preview/helm
+
+  promote-helm-quality:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/helm-quality.yaml@main
+    with:
+      helm_path: promote/helm
+
+  preview:
+    needs:
+    - helm-quality
+    - preview-helm-quality
+    - promote-helm-quality
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/gitops-preview.yaml@main
+    secrets: inherit
+    with:
+      container: true
+      environment_repository: CloudNativeEntrepreneur/example-preview-envs
+      project: example-preview-envs
+      comment: |
+        Your preview environment has been published! :rocket:
+
+        It may take a few minutes to spin up, but you can view it here once it's ready: [${{ github.event.repository.name }}-pr-${{ github.event.pull_request.number }}-preview](http://${{ github.event.repository.name }}.${{ github.event.repository.name }}-pr-${{ github.event.pull_request.number }}-preview.127.0.0.1.sslip.io)
+
+        You can verify the PR is ready with `kubectl`:
+        ```bash
+        kubectl get ksvc -n ${{ github.event.repository.name }}-pr-${{ github.event.pull_request.number }}-preview
+        ```

.github/workflows/publish-and-promote.yaml

@@ -0,0 +1,30 @@
+name: promote
+on:
+  push:
+    tags:
+    - v*.*.*
+
+jobs:
+
+  publish-container:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/publish-container.yaml@main
+    secrets: inherit
+
+  promote-local:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/gitops-promote-helm.yaml@main
+    secrets: inherit
+    with:
+      environment_repository: CloudNativeEntrepreneur/example-local-env
+      project: example-local-env
+      pull_request: false
+      values: |
+        # Set from promote job of CloudNativeEntrepreneur/example-hasura
+        local: true
+
+  promote-prod:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/gitops-promote-helm.yaml@main
+    secrets: inherit
+    with:
+      environment_repository: CloudNativeEntrepreneur/example-prod-env
+      project: example-prod-env
+      pull_request: false

.github/workflows/release.yaml

@@ -0,0 +1,32 @@
+name: main
+on:
+  push:
+    branches:
+    - main
+jobs:
+
+  helm-quality:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/helm-quality.yaml@main
+    with:
+      helm_path: helm
+
+  preview-helm-quality:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/helm-quality.yaml@main
+    with:
+      helm_path: preview/helm
+
+  promote-helm-quality:
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/helm-quality.yaml@main
+    with:
+      helm_path: promote/helm
+
+  release:
+    needs:
+    - helm-quality
+    - preview-helm-quality
+    - promote-helm-quality
+    uses: CloudNativeEntrepreneur/actions/.github/workflows/github-release.yaml@main
+    secrets: inherit
+    with:
+      helm: true
+      container: true

Dockerfile

@@ -1,5 +1,5 @@
 # This container runs migrations - the main hasura service is hasura/graphql-engine:v2.x.x
-FROM hasura/graphql-engine:v2.0.10.cli-migrations-v3
+FROM hasura/graphql-engine:v2.14.0.cli-migrations-v3
 
 # we are managing migrations with schemahero - so let's avoid copying it here unless we go back to using Hasura for migrations.
 # we still want the metadata and config though

Makefile

@@ -1,11 +1,12 @@
-HASURA_ENDPOINT?=http://example-hasura.default.127.0.0.1.sslip.io
-LOCAL_DEV_CLUSTER ?= kind-local-dev-cluster
+HASURA_ENDPOINT?=http://example-hasura.example-local-env.127.0.0.1.sslip.io
+LOCAL_DEV_CLUSTER ?= rancher-desktop
 NOW := $(shell date +%m_%d_%Y_%H_%M)
 SERVICE_NAME := example-hasura
-HASURA_GRAPHQL_DATABASE_URL=postgres://readmodel:$(kubectl get secret readmodel.example-readmodel-postgresql.credentials.postgresql.acid.zalan.do)@readmodel.default.cluster.svc.local:5432/readmodel
+HASURA_GRAPHQL_DATABASE_URL=postgres://readmodel:$(kubectl get secret readmodel.example-readmodel-postgresql.credentials.postgresql.acid.zalan.do)@readmodel.example-local-env.cluster.svc.local:5432/readmodel
 
 # Does what's described in Readme, runs in the background - `attach-to-tmux-session` to attach to the session where it is running
-onboard: refresh-kind-image
+onboard:
+	echo "Nothing to do. Deploy using gitops config."
 
 open:
 	code .
@@ -14,30 +15,3 @@ migrate:
 	hasura metadata apply --endpoint $(HASURA_ENDPOINT)
 	hasura migrate apply --all-databases --endpoint $(HASURA_ENDPOINT)
 	hasura metadata reload --endpoint $(HASURA_ENDPOINT)
-
-build-new-local-image:
-	kubectl ctx $(LOCAL_DEV_CLUSTER)
-	docker build -t $(SERVICE_NAME) .
-	docker tag $(SERVICE_NAME):latest dev.local/$(SERVICE_NAME):$(NOW)
-
-load-local-image-to-kind:
-	kubectl ctx $(LOCAL_DEV_CLUSTER)
-	kind --name local-dev-cluster load docker-image dev.local/$(SERVICE_NAME):$(NOW)
-
-deploy-to-local-cluster:
-	kubectl ctx $(LOCAL_DEV_CLUSTER)
-	helm template ./charts/$(SERVICE_NAME)/ \
-		-f ./charts/$(SERVICE_NAME)/values.yaml \
-		--set image.repository=dev.local/$(SERVICE_NAME),image.tag=$(NOW) \
-		| kubectl apply -f -
-	kubectl wait --for=condition=ready ksvc example-hasura --timeout=600s
-
-delete-local-deployment:
-	kubectl ctx $(LOCAL_DEV_CLUSTER)
-	helm template ./charts/$(SERVICE_NAME)/ \
-		-f ./charts/$(SERVICE_NAME)/values.yaml \
-		--set image.repository=dev.local/$(SERVICE_NAME),image.tag=$(NOW) \
-		| kubectl delete -f -
-
-refresh-kind-image: build-new-local-image load-local-image-to-kind deploy-to-local-cluster
-hard-refresh-kind-image: delete-local-deployment build-new-local-image load-local-image-to-kind deploy-to-local-cluster

config.yaml

@@ -1,5 +1,5 @@
 version: 3
-endpoint: http://example-hasura.default.127.0.0.1.sslip.io
+endpoint: http://example-hasura.example-prod-env.127.0.0.1.sslip.io
 metadata_directory: metadata
 actions:
   kind: synchronous

docker-compose.default-example.yaml

@@ -1,14 +1,14 @@
 version: '3.6'
 services:
   postgres:
-    image: postgres:12
+    image: postgres:15
     restart: always
     volumes:
     - db_data:/var/lib/postgresql/data
     environment:
       POSTGRES_PASSWORD: postgrespassword
   graphql-engine:
-    image: hasura/graphql-engine:v2.0.10
+    image: hasura/graphql-engine:v2.25.1
     ports:
     - "8080:8080"
     depends_on:

helm/templates/external-secret-example-hasura.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.localDev }}
+{{- else }}
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: example-hasura
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
+spec:
+  secretStoreRef:
+    name: fake
+    kind: ClusterSecretStore
+  target:
+    name: example-hasura
+  dataFrom:
+  - extract:
+      key: /example-hasura
+{{- end }}