Skip to content

Commit 6b2bd52

Browse files
szabozoltan69szabozoltan69
authored
Merge pull request #175 from IFRCGo/develop
Skip some translation fields
2 parents 861fbed + 0c73a95 commit 6b2bd52

23 files changed

Lines changed: 590 additions & 609 deletions

File tree

‎.github/workflows/git.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Lint commits
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
lint:
7+
name: Commit Lint
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@main
11+
- uses: toggle-corp/commit-lint@main

‎applications/argocd/production/applications/cacheppuccino.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
apiVersion: argoproj.io/v1alpha1
2+
kind: Application
3+
metadata:
4+
name: cacheppuccino
5+
namespace: argocd
6+
finalizers:
7+
- resources-finalizer.argocd.argoproj.io
8+
spec:
9+
project: default
10+
source:
11+
repoURL: ghcr.io/ifrcgo
12+
chart: cacheppuccino-helm
13+
targetRevision: 0.1.0-c1bdee99
14+
helm:
15+
valueFiles:
16+
- values/go-deploy.yaml
17+
- values/production.yaml
18+
valuesObject:
19+
fullnameOverride: ifrcgo-cacheppuccino
20+
ingress:
21+
className: nginx
22+
host: cacheppuccino.ifrc.org
23+
tls:
24+
secretName: cacheppuccino-helm-secret-cert
25+
sqlite:
26+
pvc:
27+
size: 512Mi
28+
serviceAccount:
29+
annotations:
30+
azure.workload.identity/client-id: "e2cb56dd-1c99-45cb-89f1-92b2b1b30984"
31+
secretsStoreCsiDriver:
32+
parameters:
33+
clientID: "e2cb56dd-1c99-45cb-89f1-92b2b1b30984"
34+
keyvaultName: "cacheppuccino-production"
35+
tenantId: "a2b53be5-734e-4e6c-ab0d-d184f60fd917"
36+
destination:
37+
server: https://kubernetes.default.svc
38+
namespace: cacheppuccino
39+
syncPolicy:
40+
automated:
41+
prune: true
42+
selfHeal: true
43+
syncOptions:
44+
- CreateNamespace=true

‎applications/argocd/production/applications/montandon-eoapi/application.yaml‎

Lines changed: 77 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,48 @@ metadata:
88
spec:
99
project: default
1010
sources:
11+
1112
- repoURL: https://devseed.com/eoapi-k8s/
1213
chart: eoapi
13-
targetRevision: 0.10.0
14+
targetRevision: 0.11.2
1415
helm:
16+
valueFiles:
17+
- values/argocd.yaml
1518
valuesObject:
16-
ingress:
19+
postgrescluster:
20+
# Using azure databae
21+
enabled: false
22+
vector:
1723
enabled: false
18-
# host: "montandon-eoapi.ifrc.org"
19-
# tls:
20-
# enabled: true
21-
# secretName: montandon-eoapi-helm-secret-cert
22-
# annotations:
23-
# # increase the max body size to 100MB
24-
# nginx.ingress.kubernetes.io/proxy-body-size: "100m"
25-
# nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
26-
# nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
27-
# nginx.ingress.kubernetes.io/proxy-connect-timeout: "600"
2824
raster:
2925
enabled: false
26+
ingress:
27+
# Using stac-auth-proxy
28+
enabled: false
29+
30+
serviceAccount:
31+
create: true
32+
automount: true
33+
annotations:
34+
azure.workload.identity/client-id : "8bf208ec-d73c-42d1-a4a9-817d2936a883"
35+
labels:
36+
azure.workload.identity/use: "true"
37+
38+
postgresql:
39+
type: "external-secret"
40+
external:
41+
existingSecret:
42+
# Defined here: internal/montandon-eoapi-spc.yaml
43+
name: pgstac-secrets-montandon-eoapi
44+
keys:
45+
username: "DB_USER"
46+
password: "DB_PASSWORD"
47+
# Optional: if these are provided in the secret
48+
# Note: These values override external.host, external.port and external.database if defined
49+
host: "DB_HOST"
50+
database: "DB_NAME"
51+
port: "DB_PORT"
52+
3053
stac:
3154
image:
3255
tag: 6.1.2
@@ -59,86 +82,60 @@ spec:
5982
mountPath: /mnt/secrets-store
6083
readOnly: true
6184
extraVolumes:
85+
# Not required for eoAPI, but secrets-store.csi.k8s.io needs at least one pod to mount SecretProviderClass to sync Azure Key Vault with the Kubernetes secret pgstac-secrets-montandon-eoapi
6286
- name: azure-keyvault-secrets
6387
csi:
6488
driver: secrets-store.csi.k8s.io
6589
readOnly: true
6690
volumeAttributes:
6791
secretProviderClass: azure-secret-provider-montandon-eoapi
68-
vector:
69-
enabled: false
7092

71-
serviceAccount:
72-
create: true
73-
automount: true
74-
annotations:
75-
azure.workload.identity/client-id : "8bf208ec-d73c-42d1-a4a9-817d2936a883"
76-
labels:
77-
azure.workload.identity/use: "true"
78-
79-
# pgstacBootstrap:
80-
# enabled: true
81-
# settings:
82-
# annotations:
83-
# argocd.argoproj.io/hook: Sync
84-
# # labels:
85-
# # azure.workload.identity/use: "true"
86-
# # extraVolumes:
87-
# # - name: azure-keyvault-secrets
88-
# # csi:
89-
# # driver: secrets-store.csi.k8s.io
90-
# # readOnly: true
91-
# # volumeAttributes:
92-
# # secretProviderClass: azure-secret-provider-montandon-eoapi
93-
# queryables:
94-
# # configMap
95-
# - name: "stac-queryables.json"
96-
# configMapRef:
97-
# name: montandon-eoapi-stac-queryables
98-
# key: stac_queryables.json
99-
# indexFields: ["monty:hazard_codes", "monty:country_codes", "roles"]
100-
# deleteMissing: true
101-
postgresql:
102-
type: "external-secret"
103-
external:
104-
existingSecret:
105-
name: pgstac-secrets-montandon-eoapi
106-
keys:
107-
username: "DB_USER"
108-
password: "DB_PASSWORD"
109-
# Optional: if these are provided in the secret
110-
# Note: These values override external.host, external.port and external.database if defined
111-
host: "DB_HOST"
112-
database: "DB_NAME"
113-
port: "DB_PORT"
93+
pgstacBootstrap:
94+
enabled: true
95+
settings:
96+
loadSamples: false
97+
queryables:
98+
- name: "stac_queryables.json"
99+
indexFields: ["monty:hazard_codes","monty:country_codes","roles"]
100+
deleteMissing: true
101+
configMapRef:
102+
name: montandon-eoapi-stac-queryables
103+
key: stac_queryables.json
114104

115-
postgrescluster:
116-
enabled: false
117-
# instances:
118-
# - name: eoapi
119-
# replicas: 1
120-
# dataVolumeClaimSpec:
121-
# accessModes:
122-
# - "ReadWriteOnce"
123-
# resources:
124-
# requests:
125-
# storage: "600Gi"
126-
# cpu: "1024m"
127-
# memory: "3048Mi"
128105
- path: applications/argocd/production/applications/montandon-eoapi/internal/
129106
targetRevision: develop
130107
repoURL: https://github.com/IFRCGo/go-deploy.git
108+
helm:
109+
valuesObject:
110+
azure:
111+
clientID: 8bf208ec-d73c-42d1-a4a9-817d2936a883
112+
secretProviderClass:
113+
enabled: true
114+
keyvaultName: montandon-eoapi-producti
115+
131116
- repoURL: https://github.com/developmentseed/stac-auth-proxy.git
132-
targetRevision: v0.9.2
117+
targetRevision: v1.0.3
133118
path: helm/
134119
helm:
135120
valuesObject:
121+
# HealthCheck endpoints - https://github.com/developmentseed/stac-auth-proxy/pull/143
122+
startupProbe:
123+
httpGet:
124+
path: /stac/healthz
125+
livenessProbe:
126+
httpGet:
127+
path: /stac/healthz
128+
readinessProbe:
129+
httpGet:
130+
path: /stac/healthz
136131
env:
137132
UPSTREAM_URL: "http://montandon-eoapi-stac:8080"
138133
# UPSTREAM_URL: "https://montandon-eoapi.ifrc.org/stac"
139134
OIDC_DISCOVERY_URL: "https://goadmin.ifrc.org/o/.well-known/openid-configuration"
140135
OVERRIDE_HOST: "0"
141136
ROOT_PATH: "/stac"
137+
COLLECTIONS_FILTER_CLS: stac_auth_proxy.montandon_filters:CollectionsFilter
138+
ITEMS_FILTER_CLS: stac_auth_proxy.montandon_filters:ItemsFilter
142139
ingress:
143140
enabled: "true"
144141
host: "montandon-eoapi.ifrc.org"
@@ -147,6 +144,15 @@ spec:
147144
enabled: "true"
148145
secretName: "montandon-eoapi-helm-secret-cert"
149146
replicaCount: 1
147+
extraVolumes:
148+
- name: filters
149+
configMap:
150+
name: stac-auth-proxy-filters
151+
extraVolumeMounts:
152+
- name: filters
153+
mountPath: /app/src/stac_auth_proxy/montandon_filters.py
154+
subPath: montandon_filters.py
155+
readOnly: true
150156
destination:
151157
server: https://kubernetes.default.svc
152158
namespace: montandon-eoapi

‎applications/argocd/production/applications/montandon-eoapi/internal/Chart.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v2
2+
name: montandon-eoapi-extra-manifests
3+
description: Montandon eoAPI extra manifests
4+
type: application
5+
6+
version: 0.1.0
7+
appVersion: "1.0"

0 commit comments

Comments
 (0)