Merge branch 'staging' into production

resource-watch · Jan 9, 2024 · 06d7260 · 06d7260
2 parents 560ec9f + de7a988
commit 06d7260
Show file tree

Hide file tree

Showing 228 changed files with 3,654 additions and 2,876 deletions.
diff --git a/terraform-k8s-infrastructure/.terraform.lock.hcl b/terraform-k8s-infrastructure/.terraform.lock.hcl
diff --git a/terraform-k8s-infrastructure/main.tf b/terraform-k8s-infrastructure/main.tf
@@ -51,6 +51,7 @@ module "k8s_microservice_routing" {
   tf_core_state_bucket = var.tf_core_state_bucket
   x_rw_domain          = var.x_rw_domain
   fw_backend_url       = var.fw_backend_url
+  require_api_key      = var.require_api_key
 }
 
 module "k8s_namespaces" {

diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/mongodb_apps/mongodb-apps-values.yaml b/terraform-k8s-infrastructure/modules/k8s_data_layer/mongodb_apps/mongodb-apps-values.yaml
@@ -3,7 +3,7 @@ port: 27017
 
 replicaSetName: mongodb-apps
 
-podDisruptionBudget: {}
+podDisruptionBudget: { }
 # maxUnavailable: 1
 # minAvailable: 2
 
@@ -21,7 +21,7 @@ image:
   pullPolicy: IfNotPresent
 
 # Annotations to be added to MongoDB pods
-podAnnotations: {}
+podAnnotations: { }
 
 resources:
   requests:
@@ -33,7 +33,7 @@ resources:
 
 ## Node selector
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
-nodeSelector: {}
+nodeSelector: { }
 
 affinity:
   nodeAffinity:
@@ -67,10 +67,10 @@ persistentVolume:
   accessModes:
     - ReadWriteOnce
   size: 50Gi
-  annotations: {}
+  annotations: { }
 
 # Annotations to be added to the service
-serviceAnnotations: {}
+serviceAnnotations: { }
 
 tls:
   # Enable or disable MongoDB TLS support

diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/postgresql/postgresql.yaml b/terraform-k8s-infrastructure/modules/k8s_data_layer/postgresql/postgresql.yaml
@@ -3,7 +3,7 @@
 ## Current available global Docker image parameters: imageRegistry and imagePullSecrets
 ##
 global:
-  postgresql: {}
+  postgresql: { }
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
@@ -118,7 +118,7 @@ postgresqlDataDir: /bitnami/postgresql/data
 ##     value: "bar"
 ##
 # extraEnv:
-extraEnv: []
+extraEnv: [ ]
 
 ## Name of a ConfigMap containing extra env vars
 ##
@@ -222,7 +222,7 @@ service:
 
   ## Provide any additional annotations which may be required.
   ## The value is evaluated as a template, so, for example, the value can depend on .Release or .Chart
-  annotations: {}
+  annotations: { }
   ## Set the LoadBalancer service type to internal only.
   ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
   ##
@@ -277,7 +277,7 @@ persistence:
   accessModes:
     - ReadWriteOnce
   size: 75Gi
-  annotations: {}
+  annotations: { }
 
 ## updateStrategy for PostgreSQL StatefulSet and its slaves StatefulSets
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
@@ -293,7 +293,7 @@ master:
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
   ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
-  nodeSelector: {}
+  nodeSelector: { }
   affinity:
     nodeAffinity:
       requiredDuringSchedulingIgnoredDuringExecution:
@@ -303,18 +303,18 @@ master:
                 operator: In
                 values:
                   - core
-  tolerations: []
-  labels: {}
-  annotations: {}
-  podLabels: {}
-  podAnnotations: {}
+  tolerations: [ ]
+  labels: { }
+  annotations: { }
+  podLabels: { }
+  podAnnotations: { }
   priorityClassName: ""
   ## Additional PostgreSQL Master Volume mounts
   ##
-  extraVolumeMounts: []
+  extraVolumeMounts: [ ]
   ## Additional PostgreSQL Master Volumes
   ##
-  extraVolumes: []
+  extraVolumes: [ ]
 
 ##
 ## PostgreSQL Slave parameters
@@ -325,20 +325,20 @@ slave:
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
   ## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption
-  nodeSelector: {}
-  affinity: {}
-  tolerations: []
-  labels: {}
-  annotations: {}
-  podLabels: {}
-  podAnnotations: {}
+  nodeSelector: { }
+  affinity: { }
+  tolerations: [ ]
+  labels: { }
+  annotations: { }
+  podLabels: { }
+  podAnnotations: { }
   priorityClassName: ""
   ## Additional PostgreSQL Slave Volume mounts
   ##
-  extraVolumeMounts: []
+  extraVolumeMounts: [ ]
   ## Additional PostgreSQL Slave Volumes
   ##
-  extraVolumes: []
+  extraVolumes: [ ]
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
@@ -370,7 +370,7 @@ networkPolicy:
     ##
     # explicitNamespacesSelector:
     # matchLabels:
-    # role: frontend
+  # role: frontend
   # matchExpressions:
   # - {key: role, operator: In, values: [frontend]}
 
@@ -405,7 +405,7 @@ metrics:
     loadBalancerIP:
   serviceMonitor:
     enabled: false
-    additionalLabels: {}
+    additionalLabels: { }
     # namespace: monitoring
     # interval: 30s
     # scrapeTimeout: 10s
@@ -414,17 +414,17 @@ metrics:
   ## ref: https://github.com/coreos/prometheus-operator#customresourcedefinitions
   prometheusRule:
     enabled: false
-    additionalLabels: {}
+    additionalLabels: { }
     namespace: ""
-    rules: []
+    rules: [ ]
       ## These are just examples rules, please adapt them to your needs.
       ## Make sure to constraint the rules to the current postgresql service.
       # - alert: HugeReplicationLag
       #   expr: pg_replication_lag{service="{{ template "postgresql.fullname" . }}-metrics"} / 3600 > 1
       #   for: 1m
       #   labels:
       #     severity: critical
-      #   annotations:
+    #   annotations:
     #     description: replication for {{ template "postgresql.fullname" . }} PostgreSQL is lagging by {{ "{{ $value }}" }} hour(s).
     #     summary: PostgreSQL replication is lagging by {{ "{{ $value }}" }} hour(s).
   image:

diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/rabbitmq/rabbitmq.yaml b/terraform-k8s-infrastructure/modules/k8s_data_layer/rabbitmq/rabbitmq.yaml
@@ -3,9 +3,9 @@
 ## Current available global Docker image parameters: imageRegistry and imagePullSecrets
 ##
 global:
-# imageRegistry: dockerhub
- imagePullSecrets:
-   - regcred
+  # imageRegistry: dockerhub
+  imagePullSecrets:
+    - regcred
 #   storageClass: myStorageClass
 
 ## Bitnami RabbitMQ image version
@@ -124,7 +124,7 @@ rabbitmq:
 
   ## environment variables to configure rabbitmq
   ## ref: https://www.rabbitmq.com/configure.html#customise-environment
-  env: {}
+  env: { }
 
   ## Configuration file content: required cluster configuration
   ## Do not override unless you know what you are doing. To add more configuration, use `extraConfiguration` of `advancedConfiguration` instead
@@ -214,7 +214,7 @@ service:
   managerPort: 15672
 
   ## Service annotations
-  annotations: {}
+  annotations: { }
   # service.beta.kubernetes.io/aws-load-balancer-internal: 0.0.0.0/0
 
   ## Load Balancer sources
@@ -230,7 +230,7 @@ service:
   # extraContainerPorts:
 
 # Additional pod labels to apply
-podLabels: {}
+podLabels: { }
 
 ## Pod Security Context
 ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
@@ -239,7 +239,7 @@ securityContext:
   enabled: true
   fsGroup: 1001
   runAsUser: 1001
-  extra: {}
+  extra: { }
 
 persistence:
   ## this enables PVC templates that will create one per pod
@@ -316,9 +316,9 @@ updateStrategy:
 ## Node labels and tolerations for pod assignment
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
-nodeSelector: {}
+nodeSelector: { }
 
-tolerations: []
+tolerations: [ ]
 affinity:
   nodeAffinity:
     requiredDuringSchedulingIgnoredDuringExecution:
@@ -347,10 +347,10 @@ affinity:
 ##           topologyKey: failure-domain.beta.kubernetes.io/zone
 
 ## annotations for rabbitmq pods
-podAnnotations: {}
+podAnnotations: { }
 
 ## Configure the podDisruptionBudget
-podDisruptionBudget: {}
+podDisruptionBudget: { }
 # maxUnavailable: 1
 # minAvailable: 1
 
@@ -382,7 +382,7 @@ ingress:
   ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md
   ##
   ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set
-  annotations: {}
+  annotations: { }
   #  kubernetes.io/ingress.class: nginx
   #  kubernetes.io/tls-acme: true
 
@@ -423,9 +423,9 @@ forceBoot:
 ## Optionally specify extra secrets to be created by the chart.
 ## This can be useful when combined with load_definitions to automatically create the secret containing the definitions to be loaded.
 ##
-extraSecrets: {}
+extraSecrets: { }
   # load-definition:
   #   load_definition.json: |
-  #     {
+#     {
 #       ...
 #     }
diff --git a/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis-db.md b/terraform-k8s-infrastructure/modules/k8s_data_layer/redis/redis-db.md
@@ -1,6 +1,8 @@
 # Redis database allocation
 
-Redis uses databases (similar to the traditional concept of a SQL database) to keep data separated. By default, it has 16 databases, numbered 0-15. This document serves to document which RW API microservice uses which database, so we avoid multiple microservices sharing the same database.
+Redis uses databases (similar to the traditional concept of a SQL database) to keep data separated. By default, it has
+16 databases, numbered 0-15. This document serves to document which RW API microservice uses which database, so we avoid
+multiple microservices sharing the same database.
 
 - 0: Default database. Shared by multiple microservices.
 - 1: <has some koa sessions keys, not clear if CT leftovers>