chore(test): Test pubsub and postgres in CI

.github/workflows/ci.yml

@@ -20,13 +20,13 @@ jobs:
   integration:
     runs-on: ubuntu-20.04
     strategy:
-      max-parallel: 3
       matrix:
         case:
           - "default"
           - "image"
           - "ingress"
           - "volume"
+          - "pubsub"
         k8s_version:
           - v1.25.0
           - v1.27.0
@@ -45,6 +45,12 @@ jobs:
           kubernetes-version: ${{ matrix.k8s_version }}
           addons: default-storageclass,storage-provisioner,ingress
 
+      - name: Deploy Postgres
+        run: kubectl apply -f test/helper/postgres/postgres.yaml
+
+      - name: Deploy PubSub Emulator
+        run: kubectl apply -f test/helper/pubsub/pubsub.yaml
+
       - name: Wait For Ingress Pods
         run: |
           sleep 5
@@ -71,4 +77,16 @@ jobs:
         if: always()
         run: |
           kubectl -n default get all
-          kubectl -n default logs pod/release-name-bindplane-0
+          kubectl -n default logs sts/release-name-bindplane || kubectl -n default logs deploy/release-name-bindplane
+
+      - name: "Debug: Get postgres status and logs"
+        if: always()
+        run: |
+          kubectl -n postgres get all
+          kubectl -n postgres logs pod/postgres-0
+
+      - name: "Debug: Get pubsub status and logs"
+        if: always()
+        run: |
+          kubectl -n pubsub get all
+          kubectl -n pubsub logs pod/pubsub-emulator-0

charts/bindplane/Chart.yaml

@@ -3,7 +3,7 @@ name: bindplane
 description: BindPlane OP is an observability pipeline.
 type: application
 # The chart's version
-version: 1.7.3
+version: 1.7.4
 # The BindPlane OP tagged release. If the user does not
 # set the `image.tag` values option, this version is used.
 appVersion: 1.52.0

charts/bindplane/README.md

@@ -1,6 +1,6 @@
 # bindplane
 
-![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.52.0](https://img.shields.io/badge/AppVersion-1.52.0-informational?style=flat-square)
+![Version: 1.7.4](https://img.shields.io/badge/Version-1.7.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.52.0](https://img.shields.io/badge/AppVersion-1.52.0-informational?style=flat-square)
 
 BindPlane OP is an observability pipeline.
 
@@ -91,6 +91,8 @@ BindPlane OP is an observability pipeline.
 | eventbus.kafka.topic | string | `""` | Topic to use. |
 | eventbus.pubsub.credentials.secret | string | `""` | Optional Kubernetes secret which contains Google Cloud JSON service account credentials. Not required when running within Google Cloud with the Pub/Sub scope enabled. |
 | eventbus.pubsub.credentials.subPath | string | `""` | Sub path for the secret which contains the Google Cloud credential JSON |
+| eventbus.pubsub.endpoint | string | `""` | For testing against an emulator only. |
+| eventbus.pubsub.insecure | bool | `false` | For testing against an emulator only. |
 | eventbus.pubsub.projectid | string | `""` |  |
 | eventbus.pubsub.topic | string | `""` |  |
 | eventbus.type | string | `""` |  |

charts/bindplane/templates/bindplane.yaml

@@ -168,6 +168,14 @@ spec:
             - name: BINDPLANE_GOOGLE_PUB_SUB_CREDENTIALS_FILE
               value: /credentials.json
             {{- end }}
+            {{- if .Values.eventbus.pubsub.endpoint }}
+            - name: BINDPLANE_GOOGLE_PUB_SUB_ENDPOINT
+              value: {{ .Values.eventbus.pubsub.endpoint }}
+            {{- end }}
+            {{- if .Values.eventbus.pubsub.insecure }}
+            - name: BINDPLANE_GOOGLE_PUB_SUB_INSECURE
+              value: "{{ .Values.eventbus.pubsub.insecure }}"
+            {{- end }}
             {{- end }}
             {{- if eq .Values.eventbus.type "kafka" }}
             - name: BINDPLANE_EVENT_BUS_TYPE

charts/bindplane/values.yaml

@@ -127,6 +127,10 @@ eventbus:
       secret: ""
       # -- Sub path for the secret which contains the Google Cloud credential JSON
       subPath: ""
+    # -- For testing against an emulator only.
+    endpoint: ""
+    # -- For testing against an emulator only.
+    insecure: false
 
   kafka:
     # -- Comma separated list of brokers to use, in the form of `host:port`.

test/cases/all/values.yaml

@@ -14,11 +14,22 @@ config:
 enterprise: false
 mutliAccount: false
 backend:
-  type: bbolt
+  type: postgres
   bbolt:
     volumeSize: 2Gi
+  postgres:
+    host: postgres.postgres.svc.cluster.local
+    database: bindplane
+    username: postgres
+    password: password
+    maxConnections: 20
 eventbus:
-  type: ""
+  type: 'pubsub'
+  pubsub:
+    projectid: 'my-project'
+    topic: 'bindplane'
+    insecure: true
+    endpoint: "pubsub-emulator.pubsub.svc.cluster.local:8681"
 auth:
   type: ldap
   ldap:
@@ -50,6 +61,6 @@ trace:
   otlp:
     endpoint: collector.local
     insecure: true
-replicas: 2 # Don't do this with bolt store in production
+replicas: 3
 autoscaling:
   enable: false

test/cases/pubsub/values.yaml

@@ -0,0 +1,43 @@
+# Required options
+config:
+  username: bpuser
+  password: bppass
+  secret_key: 12D8FB6E-1532-4A4C-97AF-95A430BE5E6E
+  sessions_secret: 4484766F-5016-4077-B8E0-0DE1D637854B
+  licenseUseSecret: true
+
+extraPodLabels:
+  extraKey: extraValue
+  extraKey2: extraValue2
+
+prometheus:
+  extraPodLabels:
+    extraKeyProm: extraValueProm
+    extraKeyProm2: extraValueProm2
+
+backend:
+  type: postgres
+  postgres:
+    host: postgres.postgres.svc.cluster.local
+    database: bindplane
+    username: postgres
+    password: password
+    maxConnections: 20
+
+eventbus:
+  type: 'pubsub'
+  pubsub:
+    projectid: 'my-project'
+    topic: 'bindplane'
+    insecure: true
+    endpoint: "pubsub-emulator.pubsub.svc.cluster.local:8681"
+
+replicas: 3
+
+resources:
+  requests:
+    memory: 100Mi
+    cpu: 100m
+  limits:
+    memory: 100Mi
+    cpu: 100m

test/helper/postgres/postgres.yaml

@@ -0,0 +1,75 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: postgres
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: postgres
+  namespace: postgres
+spec:
+  serviceName: postgres
+  selector:
+    matchLabels:
+      app: postgres
+  template:
+    metadata:
+      labels:
+        app: postgres
+    spec:
+      initContainers:
+        - name: take-data-dir-ownership
+          image: alpine:3
+          command:
+          - chown
+          - -R
+          - 70:70
+          - /data
+          volumeMounts:
+          - name: database
+            mountPath: /data
+      containers:
+        - image: postgres:14.7-alpine3.17
+          name: postgres
+          ports:
+            - containerPort: 5432
+              name: postgres
+          resources:
+            requests:
+              cpu: 100m
+              memory: 100Mi
+            limits:
+              memory: 100Mi
+          env:
+            - name: POSTGRES_PASSWORD
+              value: password
+            - name: PGDATA
+              value: /data/postgresql
+          volumeMounts:
+            - mountPath: /data
+              name: database
+          livenessProbe:
+            tcpSocket:
+              port: 5432
+      volumes:
+        - name: database
+          emptyDir: {}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: postgres
+  name: postgres
+  namespace: postgres
+spec:
+  ports:
+  - port: 5432
+    protocol: TCP
+    targetPort: postgres
+    name: postgres
+  selector:
+    app: postgres
+  sessionAffinity: None
+  type: ClusterIP

test/helper/pubsub/pubsub.yaml

@@ -0,0 +1,59 @@
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: pubsub
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: pubsub-emulator
+  namespace: pubsub
+spec:
+  serviceName: pubsub-emulator
+  selector:
+    matchLabels:
+      app: pubsub-emulator
+  template:
+    metadata:
+      labels:
+        app: pubsub-emulator
+    spec:
+      containers:
+        - image: messagebird/gcloud-pubsub-emulator:latest
+          name: emulator
+          ports:
+            - containerPort: 8681
+            - containerPort: 8682
+          resources:
+            requests:
+              cpu: 100m
+              memory: 512Mi
+            limits:
+              memory: 512Mi
+          env:
+            - name: PUBSUB_PROJECT1
+              value: bindplane-local-dev,test-topic:test-subscription
+          livenessProbe:
+            tcpSocket:
+              port: 8681
+          readinessProbe:
+            tcpSocket:
+              port: 8682
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    app: pubsub-emulator
+  name: pubsub-emulator
+  namespace: pubsub
+spec:
+  ports:
+  - port: 8681
+    protocol: TCP
+    targetPort: 8681
+    name: emulator
+  selector:
+    app: pubsub-emulator
+  sessionAffinity: None
+  type: ClusterIP