Enable Data API and Hasura in CKAN charts (#13)

* Enable hasura in k8s * Add hasura envars * Add data-api svc/secret/deployment
datopian · Feb 6, 2023 · 8ec6181 · 8ec6181
1 parent 6c240a3
commit 8ec6181
Show file tree

Hide file tree

Showing 7 changed files with 168 additions and 1 deletion.
diff --git a/ckan/Chart.yaml b/ckan/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v3.0.1
+version: v3.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/ckan/templates/data-api-deployment.yaml b/ckan/templates/data-api-deployment.yaml
@@ -0,0 +1,60 @@
+{{ if .Values.dataAPI.enable }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.general.projectId }}-data-api
+  labels:
+    app: data-api
+spec:
+  {{ if not .Values.dataAPI.hpa.enable }}
+  replicas: {{ .Values.dataAPI.replicaCount | default 1 }}
+  {{ end }}
+  selector:
+    matchLabels:
+      app: data-api
+  template:
+    metadata:
+      labels:
+        app: data-api
+    spec:
+      {{ if .Values.general.imagePullSecrets }}
+      imagePullSecrets:
+        - name: {{ .Values.general.imagePullSecrets }}
+      {{ end }}
+      containers:
+        - name: data-api
+          {{ if .Values.dataAPI.image.digest }}
+          image: {{ .Values.dataAPI.image.repository | default "datopian/data-api" }}@{{ .Values.dataAPI.image.digest }}
+          {{ else }}
+          image: {{ .Values.dataAPI.image.repository | default "datopian/data-api" }}:{{ .Values.dataAPI.image.tag }}
+          {{ end }}
+          imagePullPolicy: {{ .Values.dataAPI.image.pullPolicy | default "Always" }}
+          {{ if .Values.dataAPI.env }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.general.projectId }}-data-api-envvars
+          {{ end }}
+          {{ if .Values.dataAPI.livenessProbe }}
+          livenessProbe:
+            {{ with .Values.dataAPI.livenessProbe }}
+            {{ toYaml . | nindent 12 }}
+            {{ end }}
+          {{ end }}
+          resources:
+            {{ if .Values.dataAPI.resources }}
+            {{ with .Values.dataAPI.resources }}
+            {{ toYaml . | nindent 12 }}
+            {{ end }}
+            {{ else }}
+            limits:
+              cpu: 600m
+              memory: 1G
+            requests:
+              cpu: 100m
+              memory: 0.8G
+            {{ end }}
+          ports:
+            - containerPort: 3000
+              protocol: TCP
+
+{{ end }}
diff --git a/ckan/templates/data-api-service.yaml b/ckan/templates/data-api-service.yaml
@@ -0,0 +1,17 @@
+{{ if .Values.dataAPI.enable }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.general.projectId }}-data-api-svc
+spec:
+  type: {{ .Values.dataAPI.serviceType | default "ClusterIP" }}
+  ports:
+    - port: {{ .Values.dataAPI.port | default 80 }}
+      targetPort: {{ .Values.dataAPI.targetPort | default 3000 }}
+      protocol: TCP
+      name: http
+  selector:
+    app: data-api
+{{ end }}
+
+
diff --git a/ckan/templates/hasura-deployment.yaml b/ckan/templates/hasura-deployment.yaml
@@ -0,0 +1,53 @@
+{{ if .Values.hasura.enable }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.general.projectId }}-hasura
+  labels:
+    app: hasura
+spec:
+  {{ if not .Values.hasura.hpa.enable }}
+  replicas: {{ .Values.hasura.replicaCount | default 1 }}
+  {{ end }}
+  selector:
+    matchLabels:
+      app: hasura
+  template:
+    metadata:
+      labels:
+        app: hasura
+    spec:
+      {{ if .Values.general.imagePullSecrets }}
+      imagePullSecrets:
+        - name: {{ .Values.general.imagePullSecrets }}
+      {{ end }}
+      containers:
+        - name: hasura
+          {{ if .Values.hasura.image.digest }}
+          image: {{ .Values.hasura.image.repository | default "hasura/graphql-engine" }}@{{ .Values.hasura.image.digest }}
+          {{ else }}
+          image: {{ .Values.hasura.image.repository | default "hasura/graphql-engine" }}:{{ .Values.hasura.image.tag }}
+          {{ end }}
+          {{ if .Values.hasura.env }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.general.projectId }}-hasura-envvars
+          {{ end }}
+          resources:
+            {{ if .Values.hasura.resources }}
+            {{ with .Values.hasura.resources }}
+            {{ toYaml . | nindent 12 }}
+            {{ end }}
+            {{ else }}
+            limits:
+              cpu: 600m
+              memory: 1G
+            requests:
+              cpu: 100m
+              memory: 0.8G
+            {{ end }}
+          ports:
+            - containerPort: 8080
+              protocol: TCP
+
+{{ end }}
diff --git a/ckan/templates/hasura-service.yaml b/ckan/templates/hasura-service.yaml
@@ -0,0 +1,15 @@
+{{ if .Values.hasura.enable }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.general.projectId }}-hasura-svc
+spec:
+  type: {{ .Values.hasura.serviceType | default "ClusterIP" }}
+  ports:
+    - port: {{ .Values.hasura.port | default 80 }}
+      targetPort: {{ .Values.hasura.targetPort | default 8080 }}
+      protocol: TCP
+      name: http
+  selector:
+    app: hasura
+{{ end }}
diff --git a/ckan/templates/secrets/data-api.yaml b/ckan/templates/secrets/data-api.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.dataAPI.enable -}}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ .Values.general.projectId }}-data-api-envvars
+{{- with .Values.dataAPI.env }}
+stringData:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
diff --git a/ckan/templates/secrets/hasura.yaml b/ckan/templates/secrets/hasura.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.hasura.enable -}}
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: {{ .Values.general.projectId }}-hasura-envvars
+{{- with .Values.hasura.env }}
+stringData:
+  {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}