feat(tx-submit-api): enhance tx-submit-api (#226)

Author: verbotenj

.github/workflows/publish-tx-submit-api-helm-chart.yml

@@ -3,7 +3,7 @@ name: publish-tx-submit-api-helm-chart
 on:
   push:
     branches: ['main']
-    paths: ['charts/tx-submit-api-/**','.github/workflows/publish-tx-submit-api-helm-chart.yml']
+    paths: ['charts/tx-submit-api/**','.github/workflows/publish-tx-submit-api-helm-chart.yml']
 
 jobs:
   build-and-push-tx-submit-api-helm-chart:

charts/tx-submit-api/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: tx-submit-api
 description: Creates a Cardano Tx Submit API deployment
-version: 0.1.14
+version: 0.1.15
 appVersion: 0.20.8
 maintainers:
   - name: aurora

charts/tx-submit-api/templates/_helpers.tpl

@@ -31,7 +31,6 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-
 {{/*
 Define Cardano network.
 */}}
@@ -57,3 +56,13 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 cardano_network: {{ include "tx-submit-api.network" . }}
 cardano_service: tx-submit-api
 {{- end -}}
+
+{{/*
+tx-submit-api selector labels
+*/}}
+{{- define "tx-submit-api.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "tx-submit-api.fullname" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+cardano_network: {{ include "tx-submit-api.network" . }}
+cardano_service: tx-submit-api
+{{- end -}}

charts/tx-submit-api/templates/deployment.yaml

@@ -8,22 +8,17 @@ metadata:
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
-    matchLabels:
-      cardano_network: {{ .Values.cardano_network }}
-      app.kubernetes.io/name: {{ include "tx-submit-api.fullname" . }}
-{{ include "tx-submit-api.labels" . | indent 6 }}
+    matchLabels: {{ include "tx-submit-api.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      labels:
-        cardano_network: {{ .Values.cardano_network }}
-        app.kubernetes.io/name: {{ include "tx-submit-api.fullname" . }}
-{{ include "tx-submit-api.labels" . | indent 8 }}
+      labels: {{ include "tx-submit-api.selectorLabels" . | nindent 8 }}
     spec:
       {{- if .Values.affinity }}
       affinity: {{ .Values.affinity | toYaml | nindent 8 }}
       {{- end }}
       containers:
-      - env:
+      - name: tx-submit-api
+        env:
         - name: CARDANO_NETWORK
           value: {{ .Values.cardano_network }}
         - name: CARDANO_NODE_SOCKET_TCP_HOST
@@ -34,7 +29,6 @@ spec:
           value: {{ .Values.cardano_node.skip_check | quote }}
         image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
         imagePullPolicy: IfNotPresent
-        name: tx-submit-api
         ports:
         - name: api
           containerPort: 8090
@@ -46,6 +40,23 @@ spec:
         volumeMounts:
         - mountPath: /node-ipc
           name: node-ipc
+      - name: socat-socket-server
+        env:
+        - name: CARDANO_NODE_SOCKET_TCP_HOST
+          value: {{ .Values.cardano_node.host }}
+        - name: CARDANO_NODE_SOCKET_TCP_PORT
+          value: {{ .Values.cardano_node.port | quote }}
+        - name: SOCAT_TIMEOUT
+          value: "3600"
+        image: alpine/socat
+        args:
+          - -d
+          - -d
+          - "UNIX-LISTEN:/node-ipc/node.socket,fork,unlink-early"
+          - "TCP:$(CARDANO_NODE_SOCKET_TCP_HOST):$(CARDANO_NODE_SOCKET_TCP_PORT),keepalive,nodelay,connect-timeout=5,forever,interval=5"
+        volumeMounts:
+        - mountPath: /node-ipc
+          name: node-ipc
       restartPolicy: Always
       serviceAccountName: ""
 {{- if .Values.tolerations }}

charts/tx-submit-api/templates/ingress.yaml

@@ -21,4 +21,5 @@ spec:
   tls:
   - hosts:
     - {{ .Values.ingress.host }}
+    secretName: {{ .Values.ingress.secretName }}
 {{- end }}

charts/tx-submit-api/templates/service.yaml

@@ -1,19 +1,22 @@
+{{- if .Values.service.enabled }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    app: {{ include "tx-submit-api.fullname" . }}
-{{ include "tx-submit-api.labels" . | indent 4 }}
+  labels: {{ include "tx-submit-api.selectorLabels" . | nindent 4 }}
   name: {{ include "tx-submit-api.fullname" . }}
 spec:
   ports:
-  - name: tx-submit-api
-    port: 8090
+  - name: api
+    port: {{ .Values.service.apiPort }}
     protocol: TCP
     targetPort: 8090
-  selector:
-    cardano_network: {{ .Values.cardano_network }}
-    app.kubernetes.io/name: {{ include "tx-submit-api.fullname" . }}
+  - name: metrics
+    port: {{ .Values.service.metricsPort }}
+    protocol: TCP
+    targetPort: 8081
+  selector: {{ include "tx-submit-api.selectorLabels" . | nindent 4 }}
   sessionAffinity: ClientIP
-  type: ClusterIP
+  type: {{ .Values.service.type }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+{{- end }}

charts/tx-submit-api/values.yaml

@@ -1,19 +1,29 @@
 ---
 cardano_network: preview
 cardano_node:
-  host: cardano-node-headless
-  port: 30000
+  host: preview-node.play.dev.cardano.org:3001
+  port: 3001
   skip_check: true
 image:
   repository: ghcr.io/blinklabs-io/tx-submit-api
   tag: 0.20.7
+replicaCount: 1
+resources: {}
+
+affinity: {}
+
+tolerations: []
+
 ingress:
   enabled: false
+  annotations: {}
   host: submit-api.preview.local
-replicaCount: 1
-resources: {}
-tolerations:
-- key: kubernetes.io/arch
-  operator: Equal
-  value: arm64
-  effect: NoSchedule
+  secretName: submit-api-preview-local-tls
+
+service:
+  enabled: false
+  apiPort: 8090
+  metricsPort: 8081
+  annotations: {}
+  type: LoadBalancer
+  externalTrafficPolicy: Cluster