Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/quotes-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ jobs:
service-path: ./quotes-backend
enable-tests: true
enable-coverage: false
extra-resources: ./quotes-backend/.nais/postgres.yaml
secrets:
NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_IO_WORKLOAD_IDENTITY_PROVIDER }}
7 changes: 6 additions & 1 deletion .github/workflows/service-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ on:
required: false
type: string
default: ''
extra-resources:
description: 'Comma-separated list of additional resource files to deploy'
required: false
type: string
default: ''
secrets:
CODECOV_TOKEN:
description: 'Codecov token for coverage uploads'
Expand Down Expand Up @@ -111,6 +116,6 @@ jobs:
CLUSTER: dev-gcp
TEAM: examples
PRINT_PAYLOAD: "true"
RESOURCE: "${{ inputs.service-path }}/.nais/unleash.yaml,${{ inputs.service-path }}/.nais/app.yaml"
RESOURCE: "${{ inputs.service-path }}/.nais/unleash.yaml,${{ inputs.service-path }}/.nais/app.yaml${{ inputs.extra-resources != '' && format(',{0}', inputs.extra-resources) || '' }}"
VARS: ${{ inputs.service-path }}/.nais/dev.yaml
VAR: image=europe-north1-docker.pkg.dev/nais-io/nais/images/${{ inputs.service-name }}:${{ needs.build_push_sign.outputs.version }},namespace=examples
21 changes: 8 additions & 13 deletions quotes-backend/.nais/app.yaml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ spec:
value: "true"
- name: OTEL_METRICS_EXEMPLAR_FILTER
value: ALWAYS_ON
- name: DB_JDBC_URL
value: "$(PGJDBCURL)"
- name: DB_USERNAME
value: "$(PGUSER)"
- name: DB_PASSWORD
value: "$(PGPASSWORD)"
envFrom:
- secret: quotes-backend-unleash-api-token
liveness:
Expand Down Expand Up @@ -69,19 +75,8 @@ spec:
- emptyDir:
medium: Memory
mountPath: /app/docs
gcp:
sqlInstances:
- name: quotes-backend
type: POSTGRES_16
databases:
- name: quotes
envVarPrefix: DB
tier: db-f1-micro
flags:
- name: cloudsql.enable_pgaudit
value: "on"
- name: pgaudit.log
value: "all"
postgres:
clusterName: quotes-backend-db
ingresses:
{{#each ingresses as |url|}}
- {{url}}
Expand Down
14 changes: 14 additions & 0 deletions quotes-backend/.nais/postgres.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: data.nais.io/v1
kind: Postgres
metadata:
name: quotes-backend-db
namespace: examples
spec:
cluster:
majorVersion: "17"
resources:
cpu: 100m
diskSize: 2Gi
memory: 1Gi
database:
collation: nb_NO
Loading