Merge pull request #5 from Datawheel/canon-cms

Canon cms
Datawheel · Mar 31, 2023 · e60610d · e60610d
2 parents 7086e64 + 288dfa2
commit e60610d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 300 deletions.
diff --git a/.env b/.env
@@ -1,8 +1,9 @@
-CANON_API="https://api.dataafrica.io/"
-
+# canon-cms required variables
+CANON_API=http://localhost:3300
 CANON_LANGUAGE_DEFAULT=en
 CANON_LANGUAGES=en,es
-
-# Env vars prefixed with CANON_CONST_ are later replaced in builds
-# You have to use the __{KEY}__ global variable
-CANON_CONST_TESTCONST=23
+CANON_LOGINS=true
+CANON_CMS_ENABLE=true
+CANON_CMS_LOGGING=true
+CANON_CMS_DB=postgresql://<POSTGRESQL_USER>:<POSTGRESQL_PASSWORD>@<POSTGRESQL_IP>:<POSTGRESQL_PORT>/<POSTGRESQL_SCHEMA>
+CANON_CMS_CUBES=https://tesseract-url.com/tesseract
diff --git a/.github/workflows/google-registry-cloudrun-develop.yml b/.github/workflows/google-registry-cloudrun-develop.yml
diff --git a/.github/workflows/google-registry-gke-develop.yml b/.github/workflows/google-registry-gke-develop.yml
diff --git a/.github/workflows/google-registry-gke.yml b/.github/workflows/google-registry-gke.yml
@@ -43,8 +43,7 @@
 # 5. Ensure you have the following GitHub Variables for each environment that you will set up:
 #
 #    GitHub Variables
-#      GCP_CLOUDRUN_SERVICE              (CloudRun Service Name of the environment)
-#      GCP_CLOUDRUN_REGION               (CloudRun Service Region of the environment)
+#      GCP_IMAGE_NAME                    (Docker Image Name)
 #      GKE_APP_NAME                      (Google Kubernetes Engine Deployment Name)
 #      GKE_APP_NAMESPACE                 (Google Kubernetes Engine Deployment Namespace)
 #      GKE_CLUSTER                       (Google Kubernetes Engine Cluster Name)
@@ -66,8 +65,7 @@ env:
   GCP_PROJECT_ID: ${{ vars.GCP_PROJECT_ID }}
   GCP_ARTIFACT_REGISTRY_NAME: ${{ vars.GCP_ARTIFACT_REGISTRY_NAME }}
   GCP_ARTIFACT_REGISTRY_LOCATION: ${{ vars.GCP_ARTIFACT_REGISTRY_LOCATION }}
-  GCP_CLOUDRUN_SERVICE: ${{ vars.GCP_CLOUDRUN_SERVICE }}
-  GCP_CLOUDRUN_REGION: ${{ vars.GCP_CLOUDRUN_REGION }}
+  GCP_IMAGE_NAME: ${{ vars.GCP_IMAGE_NAME }}
   GKE_APP_NAME: ${{ vars.GKE_APP_NAME }}
   GKE_APP_NAMESPACE: ${{ vars.GKE_APP_NAMESPACE }}
   GKE_CLUSTER: ${{ vars.GKE_CLUSTER }}
@@ -76,7 +74,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: staging
+    environment: playground
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -95,20 +93,20 @@ jobs:
           gcloud builds submit \
             --quiet \
             --timeout=20m \
-            --tag ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_CLOUDRUN_SERVICE }}:${{ github.sha }}
-
+            --tag ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:${{ github.sha }}
+      
       # Uncomment for adding the latest tag to the latest image created
-      - name: Add 'Latest' Tag to Development Environments
+      - name: Add 'Latest' Tag to Development Environments 
         run: |-
           gcloud beta artifacts docker tags add \
             --quiet \
-            ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_CLOUDRUN_SERVICE }}:${{ github.sha }} \
-            ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_CLOUDRUN_SERVICE }}:latest
+            ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:${{ github.sha }} \
+            ${{ env.GCP_ARTIFACT_REGISTRY_LOCATION }}-docker.pkg.dev/${{ env.GCP_PROJECT_ID }}/${{ env.GCP_ARTIFACT_REGISTRY_NAME }}/${{ env.GCP_IMAGE_NAME }}:latest
 
   deploy:
     needs: build
     runs-on: ubuntu-latest
-    environment: staging
+    environment: playground
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -120,7 +118,7 @@ jobs:
         with:
           project_id: '${{ vars.GCP_PROJECT_ID }}'
           credentials_json: '${{ secrets.GCP_SA_KEY }}'
-
+      
       # Get google kubernetes engine credentials
       - name: Get GKE Credentials
         uses: google-github-actions/get-gke-credentials@v0
@@ -130,4 +128,4 @@ jobs:
 
       # Restart deployment by deleting old pod
       - name: Restart Deployment
-        run: kubectl delete pod -n ${{ env.GKE_APP_NAMESPACE }} -l app=${{ env.GKE_APP_NAME }}
+        run: kubectl delete pod -n ${{ env.GKE_APP_NAMESPACE }} -l app=${{ env.GKE_APP_NAME }}