Skip to content

Commit

Permalink
chore(ci): Minio deploymentConfig to deployment. (#120)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fergmac
fergmac authored Oct 30, 2024
1 parent 69f6e2e commit cb0456b
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 99 deletions.
179 changes: 90 additions & 89 deletions .github/workflows/.deploy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,99 +53,100 @@ jobs:
-p S3_HOST=${{ secrets.S3_HOST }}
-p S3_ROOT_BUCKET=${{ secrets.S3_ROOT_BUCKET }}

database:
name: Database
needs: init
# environment: ${{ inputs.environment }}
runs-on: ubuntu-latest
steps:
- name: Database
uses: bcgov-nr/[email protected]
with:
oc_namespace: ${{ vars.OC_NAMESPACE }}
oc_server: ${{ vars.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.14.37"
file: database/openshift.deploy.yml
overwrite: true
parameters:
-p DATABASE_SERVICE_NAME=gwells-dev-${{ github.event.number }}-database
-p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }}
-p IMAGE_STREAM_NAME=crunchy-postgres-gis
-p IMAGE_TAG=${{ github.event.number }}
-p NAME_SUFFIX=-dev-${{ github.event.number }}
-p STORAGE_CLASS=netapp-file-standard
-p REQUEST_CPU=200m
-p LIMIT_CPU=500m
-p LIMIT_MEMORY=1Gi
# database:
# name: Database
# needs: init
# # environment: ${{ inputs.environment }}
# runs-on: ubuntu-latest
# steps:
# - name: Database
# uses: bcgov-nr/[email protected]
# with:
# oc_namespace: ${{ vars.OC_NAMESPACE }}
# oc_server: ${{ vars.OC_SERVER }}
# oc_token: ${{ secrets.OC_TOKEN }}
# oc_version: "4.14.37"
# file: database/openshift.deploy.yml
# overwrite: true
# parameters:
# -p DATABASE_SERVICE_NAME=gwells-dev-${{ github.event.number }}-database
# -p IMAGE_STREAM_NAMESPACE=${{ vars.OC_NAMESPACE }}
# -p IMAGE_STREAM_NAME=crunchy-postgres-gis
# -p IMAGE_TAG=${{ github.event.number }}
# -p NAME_SUFFIX=-dev-${{ github.event.number }}
# -p STORAGE_CLASS=netapp-file-standard
# -p REQUEST_CPU=200m
# -p LIMIT_CPU=500m
# -p LIMIT_MEMORY=1Gi

backend:
name: Backend
needs: [ init, database ]
# environment: ${{ inputs.environment }}
runs-on: ubuntu-latest
steps:
- name: Deploy Backend
uses: bcgov-nr/[email protected]
with:
oc_namespace: ${{ vars.OC_NAMESPACE }}
oc_server: ${{ vars.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.14.37"
file: backend/openshift.deploy.yml
parameters:
-p NAME_SUFFIX=-dev-${{ github.event.number }}
-p IMAGE_TAG=${{ github.event.number }}
-p ENV_NAME=dev
-p E_LICENSING_URL=${{ vars.E_LICENSING_URL }}
-p DB_REPLICATE=${{ vars.DB_REPLICATE }}
-p DJANGO_DEBUG=${{ vars.DJANGO_DEBUG }}
-p ENABLE_ADDITIONAL_DOCUMENTS=${{ vars.ENABLE_ADDITIONAL_DOCUMENTS }}
-p S3_PRIVATE_BUCKET=${{ vars.S3_PRIVATE_BUCKET }}
-p S3_PRIVATE_HOST=${{ vars.S3_PRIVATE_HOST }}
-p S3_WELL_EXPORT_BUCKET=${{ vars.S3_WELL_EXPORT_BUCKET }}
-p SSO_AUDIENCE=${{ vars.SSO_AUDIENCE }}
-p SSO_AUTH_HOST=${{ vars.SSO_AUTH_HOST }}
-p SSO_CLIENT=${{ vars.SSO_CLIENT }}
-p SSO_IDP_HINT=${{ vars.SSO_IDP_HINT }}
-p SSO_PORT=${{ vars.SSO_PORT }}
-p SSO_PUBKEY=${{ vars.SSO_PUBKEY }}
-p SSO_REALM=${{ vars.SSO_REALM }}
-p SSO_TEST_AUDIENCE=${{ vars.SSO_TEST_AUDIENCE }}
-p SSO_TEST_CLIENT=${{ vars.SSO_TEST_CLIENT }}
-p GDAL_LIBRARY_PATH=${{ vars.GDAL_LIBRARY_PATH }}
-p GEOS_LIBRARY_PATH=${{ vars.GEOS_LIBRARY_PATH }}
-p S3_AQUIFER_BUCKET=${{ vars.S3_AQUIFER_BUCKET }}
-p S3_REGISTRANT_BUCKET=${{ vars.S3_REGISTRANT_BUCKET }}
-p S3_PRIVATE_ROOT_BUCKET=${{ vars.S3_PRIVATE_ROOT_BUCKET }}
-p S3_PRIVATE_AQUIFER_BUCKET=${{ vars.S3_PRIVATE_AQUIFER_BUCKET }}
-p S3_PRIVATE_REGISTRANT_BUCKET=${{ vars.S3_PRIVATE_REGISTRANT_BUCKET }}
-p S3_PRIVATE_WELL_BUCKET=${{ vars.S3_PRIVATE_WELL_BUCKET }}
-p ENABLE_AQUIFERS_SEARCH=${{ vars.ENABLE_AQUIFERS_SEARCH }}
-p EMAIL_NOTIFICATION_RECIPIENT=${{ vars.EMAIL_NOTIFICATION_RECIPIENT }}
-p GEOCODER_ADDRESS_API_BASE=${{ vars.GEOCODER_ADDRESS_API_BASE }}
# backend:
# name: Backend
# needs: [ init, database ]
# # environment: ${{ inputs.environment }}
# runs-on: ubuntu-latest
# steps:
# - name: Deploy Backend
# uses: bcgov-nr/[email protected]
# with:
# oc_namespace: ${{ vars.OC_NAMESPACE }}
# oc_server: ${{ vars.OC_SERVER }}
# oc_token: ${{ secrets.OC_TOKEN }}
# oc_version: "4.14.37"
# file: backend/openshift.deploy.yml
# parameters:
# -p NAME_SUFFIX=-dev-${{ github.event.number }}
# -p IMAGE_TAG=${{ github.event.number }}
# -p ENV_NAME=dev
# -p E_LICENSING_URL=${{ vars.E_LICENSING_URL }}
# -p DB_REPLICATE=${{ vars.DB_REPLICATE }}
# -p DJANGO_DEBUG=${{ vars.DJANGO_DEBUG }}
# -p ENABLE_ADDITIONAL_DOCUMENTS=${{ vars.ENABLE_ADDITIONAL_DOCUMENTS }}
# -p S3_PRIVATE_BUCKET=${{ vars.S3_PRIVATE_BUCKET }}
# -p S3_PRIVATE_HOST=${{ vars.S3_PRIVATE_HOST }}
# -p S3_WELL_EXPORT_BUCKET=${{ vars.S3_WELL_EXPORT_BUCKET }}
# -p SSO_AUDIENCE=${{ vars.SSO_AUDIENCE }}
# -p SSO_AUTH_HOST=${{ vars.SSO_AUTH_HOST }}
# -p SSO_CLIENT=${{ vars.SSO_CLIENT }}
# -p SSO_IDP_HINT=${{ vars.SSO_IDP_HINT }}
# -p SSO_PORT=${{ vars.SSO_PORT }}
# -p SSO_PUBKEY=${{ vars.SSO_PUBKEY }}
# -p SSO_REALM=${{ vars.SSO_REALM }}
# -p SSO_TEST_AUDIENCE=${{ vars.SSO_TEST_AUDIENCE }}
# -p SSO_TEST_CLIENT=${{ vars.SSO_TEST_CLIENT }}
# -p GDAL_LIBRARY_PATH=${{ vars.GDAL_LIBRARY_PATH }}
# -p GEOS_LIBRARY_PATH=${{ vars.GEOS_LIBRARY_PATH }}
# -p S3_AQUIFER_BUCKET=${{ vars.S3_AQUIFER_BUCKET }}
# -p S3_REGISTRANT_BUCKET=${{ vars.S3_REGISTRANT_BUCKET }}
# -p S3_PRIVATE_ROOT_BUCKET=${{ vars.S3_PRIVATE_ROOT_BUCKET }}
# -p S3_PRIVATE_AQUIFER_BUCKET=${{ vars.S3_PRIVATE_AQUIFER_BUCKET }}
# -p S3_PRIVATE_REGISTRANT_BUCKET=${{ vars.S3_PRIVATE_REGISTRANT_BUCKET }}
# -p S3_PRIVATE_WELL_BUCKET=${{ vars.S3_PRIVATE_WELL_BUCKET }}
# -p ENABLE_AQUIFERS_SEARCH=${{ vars.ENABLE_AQUIFERS_SEARCH }}
# -p EMAIL_NOTIFICATION_RECIPIENT=${{ vars.EMAIL_NOTIFICATION_RECIPIENT }}
# -p GEOCODER_ADDRESS_API_BASE=${{ vars.GEOCODER_ADDRESS_API_BASE }}

frontend:
name: Frontend
needs: [ init, database, backend ]
# environment: ${{ inputs.environment }}
runs-on: ubuntu-latest
steps:
- name: Deploy Frontend
uses: bcgov-nr/[email protected]
with:
oc_namespace: ${{ vars.OC_NAMESPACE }}
oc_server: ${{ vars.OC_SERVER }}
oc_token: ${{ secrets.OC_TOKEN }}
oc_version: "4.14.37"
file: frontend/openshift.deploy.yml
parameters:
-p NAME_SUFFIX=-dev-${{ github.event.number }}
-p IMAGE_TAG=${{ github.event.number }}
-p ENV_NAME=dev
# frontend:
# name: Frontend
# needs: [ init, database, backend ]
# # environment: ${{ inputs.environment }}
# runs-on: ubuntu-latest
# steps:
# - name: Deploy Frontend
# uses: bcgov-nr/[email protected]
# with:
# oc_namespace: ${{ vars.OC_NAMESPACE }}
# oc_server: ${{ vars.OC_SERVER }}
# oc_token: ${{ secrets.OC_TOKEN }}
# oc_version: "4.14.37"
# file: frontend/openshift.deploy.yml
# parameters:
# -p NAME_SUFFIX=-dev-${{ github.event.number }}
# -p IMAGE_TAG=${{ github.event.number }}
# -p ENV_NAME=dev
minio:
name: Minio
needs: [ init, database, backend, frontend ]
# needs: [ init, database, backend, frontend ]
needs: [ init ]
runs-on: ubuntu-latest
steps:
- name: Deploy Minio
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr-open.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
package: [database, backend, frontend, minio]
# package: [database, backend, frontend, minio]
package: [minio]
timeout-minutes: 20
steps:
- uses: bcgov-nr/[email protected]
Expand Down
17 changes: 8 additions & 9 deletions minio/openshift.deploy.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
apiVersion: v1
kind: Template
apiVersion: template.openshift.io/v1
metadata:
annotations:
description: "Minio deployment"
Expand Down Expand Up @@ -72,15 +71,17 @@ objects:
requests:
storage: ${DEST_PVC_SIZE}
storageClassName: netapp-file-standard
- apiVersion: apps.openshift.io/v1
kind: DeploymentConfig
- apiVersion: apps/v1
kind: Deployment
metadata:
labels:
app: "${NAME}"
template: "${NAME}-template"
name: "${NAME}"
spec:
replicas: 1
selector:
matchLabels:
deployment: ${NAME}
strategy:
activeDeadlineSeconds: 3000
recreateParams:
Expand All @@ -89,8 +90,8 @@ objects:
template:
metadata:
labels:
app: "${NAME}"
template: "${NAME}-template"
name: "${NAME}"
deployment: "${NAME}"
spec:
containers:
- env:
Expand Down Expand Up @@ -135,8 +136,6 @@ objects:
- name: data-vol
persistentVolumeClaim:
claimName: "${NAME}-data-vol"
triggers:
- type: ConfigChange
- apiVersion: v1
kind: Service
metadata:
Expand Down

0 comments on commit cb0456b

Please sign in to comment.