Merge pull request #684 from gravitl/saas-dev

Saas dev -> saas staging
gravitl · Jul 31, 2024 · 81e918c · 81e918c
2 parents 5ca0131 + b5cc8b6
commit 81e918c
Show file tree

Hide file tree

Showing 9 changed files with 292 additions and 754 deletions.
diff --git a/.github/workflows/saas-deploy-dev.yml b/.github/workflows/saas-deploy-dev.yml
@@ -45,7 +45,10 @@ jobs:
         run: kubectl set image deployment netmaker-ui netmaker-ui=${{ github.repository_owner }}/netmaker-ui-saas:${{ env.TAG }} -n accounts
 
       - name: Set Intercom vars
-        run: kubectl set env deployment netmaker-ui INTERCOM_APP_ID=al371us8 -n accounts
+        run: |
+          kubectl set env deployment netmaker-ui INTERCOM_APP_ID=al371us8 -n accounts
+          kubectl set env deployment netmaker-ui PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_DEV_KEY }} -n accounts
+          kubectl set env deployment netmaker-ui PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_HOST }} -n accounts
 
       - name: Deploy to k8s cluster
         run: kubectl rollout restart deploy netmaker-ui -n accounts

diff --git a/.github/workflows/saas-deploy-prod.yml b/.github/workflows/saas-deploy-prod.yml
@@ -46,8 +46,11 @@ jobs:
         run: kubectl set image deployment netmaker-ui netmaker-ui=${{ github.repository_owner }}/netmaker-ui-saas:${{ env.TAG }} -n accounts
 
       - name: Set Intercom vars
-        run: kubectl set env deployment netmaker-ui INTERCOM_APP_ID=al371us8 -n accounts
-
+        run: | 
+          kubectl set env deployment netmaker-ui INTERCOM_APP_ID=al371us8 -n accounts
+          kubectl set env deployment netmaker-ui PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_KEY }} -n accounts
+          kubectl set env deployment netmaker-ui PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_HOST }} -n accounts
+          
       - name: Deploy to k8s cluster
         run: kubectl rollout restart deploy netmaker-ui -n accounts
 

diff --git a/.github/workflows/saas-deploy-staging.yml b/.github/workflows/saas-deploy-staging.yml
@@ -46,7 +46,10 @@ jobs:
         run: kubectl set image deployment netmaker-ui netmaker-ui=${{ github.repository_owner }}/netmaker-ui-saas:${{ env.TAG }} -n accounts
 
       - name: Set Intercom vars
-        run: kubectl set env deployment netmaker-ui INTERCOM_APP_ID=al371us8 -n accounts
+        run: | 
+          kubectl set env deployment netmaker-ui INTERCOM_APP_ID=al371us8 -n accounts
+          kubectl set env deployment netmaker-ui PUBLIC_POSTHOG_HOST=${{ secrets.REACT_APP_PUBLIC_POSTHOG_DEV_KEY }} -n accounts
+          kubectl set env deployment netmaker-ui PUBLIC_POSTHOG_KEY=${{ secrets.REACT_APP_PUBLIC_POSTHOG_HOST }} -n accounts
 
       - name: Deploy to k8s cluster
         run: kubectl rollout restart deploy netmaker-ui -n accounts

diff --git a/generate-config.sh b/generate-config.sh
@@ -16,12 +16,26 @@ if [ -z "${INTERCOM_APP_ID:-}" ]; then
   INTERCOM_APP_ID=""
 fi
 
+# ensure it is empty string if not set
+if [ -z "${PUBLIC_POSTHOG_HOST:-}" ]; then
+  PUBLIC_POSTHOG_HOST=""
+fi
+
+# ensure it is empty string if not set
+if [ -z "${PUBLIC_POSTHOG_KEY:-}" ]; then
+  PUBLIC_POSTHOG_KEY=""
+fi
+
 cat >/usr/share/nginx/html/nmui-config.js <<EOF
 window.NMUI_AMUI_URL='$AMUI_URL';
 window.NMUI_BACKEND_URL='$BACKEND_URL';
 window.NMUI_INTERCOM_APP_ID='$INTERCOM_APP_ID';
+window.NMUI_PUBLIC_POSTHOG_HOST='$PUBLIC_POSTHOG_HOST';
+window.NMUI_PUBLIC_POSTHOG_KEY='$PUBLIC_POSTHOG_KEY';
 EOF
 
 echo ">>>> NMUI_AMUI_URL set to: $AMUI_URL <<<<<"
 echo ">>>> NMUI_BACKEND_URL set to: $BACKEND_URL <<<<<"
 echo ">>>> NMUI_INTERCOM_APP_ID set to: $INTERCOM_APP_ID <<<<<"
+echo ">>>> NMUI_PUBLIC_POSTHOG_HOST set to: $PUBLIC_POSTHOG_HOST <<<<<"
+echo ">>>> NMUI_PUBLIC_POSTHOG_KEY set to: ***** <<<<<"