Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add missing error-reporting values #43

Merged
merged 1 commit into from
Jun 13, 2024
Merged
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
3 changes: 3 additions & 0 deletions deploy/base/deployment-fdk-resource-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ spec:
httpGet:
path: /ready
port: 8080
volumeMounts:
- mountPath: /var/secrets/google
name: error-reporting-sa
3 changes: 0 additions & 3 deletions deploy/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ images:
- name: fdk-resource-service
newName: eu.gcr.io/digdir-fdk-infra/fdk-resource-service
newTag: $(GIT_COMMIT_SHA)

patchesStrategicMerge:
- env.yaml
11 changes: 11 additions & 0 deletions deploy/base/env.yaml → deploy/demo/env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ spec:
containers:
- name: fdk-resource-service
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /var/secrets/google/error-reporting-sa-key.json
- name: PROJECT_ID_GCP
valueFrom:
secretKeyRef:
name: common-demo
key: PROJECT_ID
- name: API_KEY
valueFrom:
secretKeyRef:
Expand Down Expand Up @@ -51,3 +58,7 @@ spec:
secretKeyRef:
name: kafka
key: SCHEMA_REGISTRY
volumes:
- name: error-reporting-sa
secret:
secretName: error-reporting-sa-demo
3 changes: 3 additions & 0 deletions deploy/demo/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ namespace: demo
resources:
- ../base
- ingress.yaml

patchesStrategicMerge:
- env.yaml
64 changes: 64 additions & 0 deletions deploy/prod/env.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: fdk-resource-service
labels:
app: fdk-resource-service
spec:
template:
spec:
containers:
- name: fdk-resource-service
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /var/secrets/google/error-reporting-sa-key.json
- name: PROJECT_ID_GCP
valueFrom:
secretKeyRef:
name: common-prod
key: PROJECT_ID
- name: API_KEY
valueFrom:
secretKeyRef:
name: fdk-resource-service
key: API_KEY
- name: MONGO_HOST
valueFrom:
secretKeyRef:
name: mongodb
key: MONGODB_HOST
- name: MONGODB_AUTH
valueFrom:
secretKeyRef:
name: mongodb
key: MONGODB_AUTH
- name: MONGODB_REPLICASET
valueFrom:
secretKeyRef:
name: mongodb
key: MONGODB_REPLICASET
- name: MONGO_USERNAME
valueFrom:
secretKeyRef:
name: fdk-resource-service
key: MONGODB_USER
- name: MONGO_PASSWORD
valueFrom:
secretKeyRef:
name: fdk-resource-service
key: MONGODB_PASSWORD
- name: KAFKA_BROKERS
valueFrom:
secretKeyRef:
name: kafka
key: BROKERS
- name: SCHEMA_REGISTRY
valueFrom:
secretKeyRef:
name: kafka
key: SCHEMA_REGISTRY
volumes:
- name: error-reporting-sa
secret:
secretName: error-reporting-sa-prod
3 changes: 3 additions & 0 deletions deploy/prod/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ namespace: prod
resources:
- ../base
- ingress.yaml

patchesStrategicMerge:
- env.yaml
64 changes: 64 additions & 0 deletions deploy/staging/env.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: fdk-resource-service
labels:
app: fdk-resource-service
spec:
template:
spec:
containers:
- name: fdk-resource-service
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /var/secrets/google/error-reporting-sa-key.json
- name: PROJECT_ID_GCP
valueFrom:
secretKeyRef:
name: common-staging
key: PROJECT_ID
- name: API_KEY
valueFrom:
secretKeyRef:
name: fdk-resource-service
key: API_KEY
- name: MONGO_HOST
valueFrom:
secretKeyRef:
name: mongodb
key: MONGODB_HOST
- name: MONGODB_AUTH
valueFrom:
secretKeyRef:
name: mongodb
key: MONGODB_AUTH
- name: MONGODB_REPLICASET
valueFrom:
secretKeyRef:
name: mongodb
key: MONGODB_REPLICASET
- name: MONGO_USERNAME
valueFrom:
secretKeyRef:
name: fdk-resource-service
key: MONGODB_USER
- name: MONGO_PASSWORD
valueFrom:
secretKeyRef:
name: fdk-resource-service
key: MONGODB_PASSWORD
- name: KAFKA_BROKERS
valueFrom:
secretKeyRef:
name: kafka
key: BROKERS
- name: SCHEMA_REGISTRY
valueFrom:
secretKeyRef:
name: kafka
key: SCHEMA_REGISTRY
volumes:
- name: error-reporting-sa
secret:
secretName: error-reporting-sa-staging
3 changes: 3 additions & 0 deletions deploy/staging/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ namespace: staging
resources:
- ../base
- ingress.yaml

patchesStrategicMerge:
- env.yaml
Loading