break out fog-report chart

mobilecoinfoundation · Oct 24, 2023 · 7f346e2 · 7f346e2
1 parent 68cdae8
commit 7f346e2
Show file tree

Hide file tree

Showing 17 changed files with 90 additions and 34 deletions.
diff --git a/.github/workflows/mobilecoin-dev-cd.yaml b/.github/workflows/mobilecoin-dev-cd.yaml
@@ -35,7 +35,7 @@ jobs:
 # Generate environment information
 ############################################
   generate-metadata:
-    if: "! startsWith(github.head_ref, 'dependabot/')"
+    if: ${{ ! startsWith(github.head_ref, 'dependabot/') }}
     name: 👾 Environment Info 👾
     runs-on: [self-hosted, Linux, small]
     outputs:
@@ -80,11 +80,11 @@ jobs:
       MINTING_TRUST_ROOT_PUBLIC_KEY_PEM: ${{ github.workspace }}/.tmp/minting_trust_root.public.pem
     steps:
     - name: Checkout
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       uses: actions/checkout@v3
 
     - name: Write environment values
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       env:
         ENCLAVE_SIGNING_KEY: ${{ secrets.DEV_ENCLAVE_SIGNING_KEY }}
         MINTING_TRUST_ROOT_PUBLIC: ${{ secrets.DEV_MINTING_TRUST_ROOT_PUBLIC }}
@@ -94,7 +94,7 @@ jobs:
         echo "${MINTING_TRUST_ROOT_PUBLIC}" > "${MINTING_TRUST_ROOT_PUBLIC_KEY_PEM}"
 
     - name: Cache rust build binaries
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       id: rust_artifact_cache
       uses: ./.github/actions/mobilecoin-cache-rust-binaries
       with:
@@ -173,12 +173,12 @@ jobs:
         done
 
     - name: Check artifacts
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       run: |
         ls -alR rust_build_artifacts
 
     - name: Upload artifacts
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       uses: actions/upload-artifact@v3
       with:
         name: rust-binaries
@@ -192,17 +192,17 @@ jobs:
       image: golang:1.18.5
     steps:
     - name: Checkout
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       uses: actions/checkout@v3
 
     - name: Add protobuf-compiler
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       run: |
         apt update
         apt install -y protobuf-compiler zstd
 
     - name: Cache go build binaries
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       id: go_artifact_cache
       uses: ./.github/actions/mobilecoin-cache-go-binaries
       with:
@@ -220,12 +220,12 @@ jobs:
         cp go-grpc-gateway ../go_build_artifacts/
 
     - name: check artifacts
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       run: |
         ls -alR go_build_artifacts
 
     - name: Upload Artifacts
-      if: "! contains(github.event.head_commit.message, '[skip build]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip build]') }}
       uses: actions/upload-artifact@v3
       with:
         name: go-binaries
@@ -367,13 +367,14 @@ jobs:
         - mc-core-dev-env-setup
         - mobilecoind
         - watcher
+        - fog-report
     steps:
     - name: Checkout
-      if: "! contains(github.event.head_commit.message, '[skip charts]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip charts]') }}
       uses: actions/checkout@v3
 
     - name: Package and publish chart
-      if: "! contains(github.event.head_commit.message, '[skip charts]')"
+      if: ${{ ! contains(github.event.head_commit.message, '[skip charts]') }}
       uses: mobilecoinofficial/gha-k8s-toolbox@v1
       with:
         action: helm-publish

diff --git a/.github/workflows/mobilecoin-workflow-dev-deploy.yaml b/.github/workflows/mobilecoin-workflow-dev-deploy.yaml
@@ -128,6 +128,50 @@ jobs:
         rancher_url: ${{ secrets.DEV_RANCHER_URL }}
         rancher_token: ${{ secrets.DEV_RANCHER_TOKEN }}
 
+  fog-report-deploy:
+    needs:
+    - consensus-deploy
+    runs-on: [self-hosted, Linux, small]
+    steps:
+    - name: Generate fog-report values file
+      run: |
+        mkdir -p "${VALUES_BASE_PATH}"
+        cat <<EOF > "${VALUES_BASE_PATH}/fog-report-values.yaml"
+        image:
+          org: ${{ inputs.docker_image_org }}
+
+        mobilecoin:
+          network: ${{ inputs.namespace }}
+          partner: dev
+
+        fogReport:
+          hosts:
+          - fog.${{ inputs.namespace }}.development.mobilecoin.com
+          ingress:
+            common:
+              blocklist:
+                enabled: false
+              tls:
+                clusterIssuer: google-public-ca
+          externalSecrets:
+            postgresReader:
+              name: fog-recovery-postgresql
+
+    - name: Deploy fog-report
+      uses: mobilecoinofficial/gha-k8s-toolbox@v1
+      with:
+        action: helm-deploy
+        chart_repo: ${{ inputs.chart_repo }}
+        chart_name: fog-report
+        chart_version: ${{ inputs.version }}
+        chart_wait_timeout: 10m
+        chart_values: ${{ env.VALUES_BASE_PATH }}/fog-report-values.yaml
+        release_name: fog-report
+        namespace: ${{ inputs.namespace }}
+        rancher_cluster: ${{ secrets.DEV_RANCHER_CLUSTER }}
+        rancher_url: ${{ secrets.DEV_RANCHER_URL }}
+        rancher_token: ${{ secrets.DEV_RANCHER_TOKEN }}
+
   fog-services-deploy:
     needs:
     - consensus-deploy

diff --git a/.internal-ci/helm/fog-report/templates/fog-report-configmap.yaml b/.internal-ci/helm/fog-report/templates/fog-report-configmap.yaml
@@ -2,8 +2,8 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: {{ include "fog-report.fullname" }}
+  name: {{ include "fog-report.fullname" . }}
   labels:
     {{- include "fog-report.labels" . | nindent 4 }}
 data:
-  {{- toYaml .Values.fogReport.configMap | nindent 2 }}
+  {{- toYaml .Values.fogReport.configMap.data | nindent 2 }}
diff --git a/.internal-ci/helm/fog-report/templates/fog-report-deployment.yaml b/.internal-ci/helm/fog-report/templates/fog-report-deployment.yaml
@@ -66,7 +66,7 @@ spec:
         - name: MC_SENTRY_DSN
           valueFrom:
             configMapKeyRef:
-              name: {{ .Values.fogReport.externalConfigMap.sentry.name }}
+              name: {{ .Values.fogReport.externalConfigMaps.sentry.name }}
               key: fog-report-sentry-dsn
               optional: true
         # Maps to Sentry Environment
@@ -77,12 +77,12 @@ spec:
         - name: FOGDB_HOST
           valueFrom:
             configMapKeyRef:
-              name: {{ .Values.fogReport.externalConfigMap.postgresReader.name }}
+              name: {{ .Values.fogReport.externalConfigMaps.postgresReader.name }}
               key: postgresql-hostname
         - name: FOGDB_USER
           valueFrom:
             configMapKeyRef:
-              name: {{ .Values.fogReport.externalConfigMap.postgresReader.name }}
+              name: {{ .Values.fogReport.externalConfigMaps.postgresReader.name }}
               key: postgresql-username
         - name: FOGDB_PASSWORD
           valueFrom:
@@ -92,12 +92,12 @@ spec:
         - name: FOGDB_DATABASE
           valueFrom:
             configMapKeyRef:
-              name: {{ .Values.fogReport.externalConfigMap.postgresReader.name }}
+              name: {{ .Values.fogReport.externalConfigMaps.postgresReader.name }}
               key: postgresql-database
         - name: FOGDB_SSL_OPTIONS
           valueFrom:
             configMapKeyRef:
-              name: {{ .Values.fogReport.externalConfigMap.postgresReader.name }}
+              name: {{ .Values.fogReport.externalConfigMaps.postgresReader.name }}
               key: postgresql-ssl-options
         - name: DATABASE_URL
           value: "postgres://$(FOGDB_USER):$(FOGDB_PASSWORD)@$(FOGDB_HOST)/$(FOGDB_DATABASE)$(FOGDB_SSL_OPTIONS)"

diff --git a/.internal-ci/helm/fog-report/templates/fog-report-grpc-ingress.yaml b/.internal-ci/helm/fog-report/templates/fog-report-grpc-ingress.yaml
@@ -1,5 +1,5 @@
 # Copyright (c) 2018-2023 The MobileCoin Foundation
-{{- if .Values.ingress.enabled }}
+{{- if .Values.fogReport.ingress.enabled }}
 {{- $hosts := .Values.fogReport.hosts }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress

diff --git a/.internal-ci/helm/fog-report/templates/fog-report-http-ingress.yaml b/.internal-ci/helm/fog-report/templates/fog-report-http-ingress.yaml
@@ -1,5 +1,5 @@
 # Copyright (c) 2018-2023 The MobileCoin Foundation
-{{- if .Values.ingress.enabled }}
+{{- if .Values.fogReport.ingress.enabled }}
 {{- $hosts := .Values.fogReport.hosts }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress

diff --git a/.internal-ci/helm/fog-report/templates/fog-report-service.yaml b/.internal-ci/helm/fog-report/templates/fog-report-service.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2022 The MobileCoin Foundation
+# Copyright (c) 2018-2023 The MobileCoin Foundation
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/.internal-ci/helm/fog-report/templates/supervisord-admin-configmap.yaml b/.internal-ci/helm/fog-report/templates/supervisord-admin-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2022 The MobileCoin Foundation
+# Copyright (c) 2018-2023 The MobileCoin Foundation
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/.internal-ci/helm/fog-report/templates/supervisord-daemon-configmap.yaml b/.internal-ci/helm/fog-report/templates/supervisord-daemon-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2022 The MobileCoin Foundation
+# Copyright (c) 2018-2023 The MobileCoin Foundation
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/.internal-ci/helm/fog-report/templates/supervisord-fog-report-configmap.yaml b/.internal-ci/helm/fog-report/templates/supervisord-fog-report-configmap.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018-2022 The MobileCoin Foundation
+# Copyright (c) 2018-2023 The MobileCoin Foundation
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/.internal-ci/helm/fog-services-config/templates/fog-report-configmap.yaml b/.internal-ci/helm/fog-services-config/templates/fog-report-configmap.yaml
@@ -1,9 +1,9 @@
 # Copyright (c) 2018-2022 The MobileCoin Foundation
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: fog-report
-  labels:
-    {{- include "fogServicesConfig.labels" . | nindent 4 }}
-data:
-  {{- toYaml .Values.fogReport.configMap | nindent 2 }}
+# kind: ConfigMap
+# apiVersion: v1
+# metadata:
+#   name: fog-report
+#   labels:
+#     {{- include "fogServicesConfig.labels" . | nindent 4 }}
+# data:
+#   {{- toYaml .Values.fogReport.configMap | nindent 2 }}
diff --git a/.internal-ci/helm/fog-services/templates/fog-report-deployment.yaml b/.internal-ci/helm/fog-services/templates/fog-report-deployment.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2018-2022 The MobileCoin Foundation
+{{- if .Values.fogReport.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -209,3 +210,4 @@ spec:
               name: {{ include "fogServices.fullname" . }}-supervisord-fog-report
           - configMap:
               name: {{ include "fogServices.fullname" . }}-supervisord-admin
+{{- end }}
diff --git a/.internal-ci/helm/fog-services/templates/fog-report-grpc-ingress.yaml b/.internal-ci/helm/fog-services/templates/fog-report-grpc-ingress.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2018-2022 The MobileCoin Foundation
+{{- if .Values.fogReport.enabled }}
 {{- if .Values.ingress.enabled }}
 {{- $hosts := split "\n" (include "fogServices.fogReportHosts" . | trim) }}
 apiVersion: networking.k8s.io/v1
@@ -35,3 +36,4 @@ spec:
               name: report-grpc
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/.internal-ci/helm/fog-services/templates/fog-report-http-ingress.yaml b/.internal-ci/helm/fog-services/templates/fog-report-http-ingress.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2018-2022 The MobileCoin Foundation
+{{- if .Values.fogReport.enabled }}
 {{- if .Values.ingress.enabled }}
 {{- $hosts := split "\n" (include "fogServices.fogReportHosts" . | trim) }}
 apiVersion: networking.k8s.io/v1
@@ -35,3 +36,4 @@ spec:
               name: report-http
   {{- end }}
 {{- end }}
+{{- end }}
diff --git a/.internal-ci/helm/fog-services/templates/fog-report-service.yaml b/.internal-ci/helm/fog-services/templates/fog-report-service.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2018-2022 The MobileCoin Foundation
+{{- if .Values.fogReport.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -21,3 +22,4 @@ spec:
   - name: report-http
     port: 8222
     targetPort: report-http
+{{- end }}
diff --git a/.internal-ci/helm/fog-services/templates/fog-report-servicmonitor.yaml b/.internal-ci/helm/fog-services/templates/fog-report-servicmonitor.yaml
@@ -1,4 +1,5 @@
 # Copyright (c) 2018-2022 The MobileCoin Foundation
+{{- if .Values.fogReport.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -19,3 +20,4 @@ spec:
       replacement: {{ include "fogServices.mobileCoinNetwork.network" . }}
     - targetLabel: partner
       replacement: {{ include "fogServices.mobileCoinNetwork.partner" . }}
+{{- end }}
diff --git a/.internal-ci/helm/fog-services/values.yaml b/.internal-ci/helm/fog-services/values.yaml
@@ -301,6 +301,7 @@ fogLedger:
 
 ### Fog Report Service
 fogReport:
+  enabled: false
   replicaCount: 2
   image:
     org: ''