testing

adskyiproger · adskyiproger · commit 1959edb49cb9 · 2025-11-11T14:43:57.000+02:00
diff --git a/.github/workflows/deploy-dependencies.yml b/.github/workflows/deploy-dependencies.yml
@@ -9,7 +9,9 @@ on:
         default: "dev"
         type: choice
         options:
-          - ""
+          - demo1
+          - production
+          - staging
 jobs:
   approve:
     environment: ${{ inputs.environment }}
diff --git a/.github/workflows/deploy-opencrvs.yml b/.github/workflows/deploy-opencrvs.yml
@@ -25,7 +25,9 @@ on:
         default: "dev"
         type: choice
         options:
-          - ""
+          - demo1
+          - production
+          - staging
 
 jobs:
   approve:
diff --git a/.github/workflows/github-to-k8s-sync-env.yml b/.github/workflows/github-to-k8s-sync-env.yml
@@ -9,7 +9,9 @@ on:
         default: "dev"
         type: choice
         options:
-          - ""
+          - demo1
+          - production
+          - staging
       mapping_file:
         description: "Secrets mapping template"
         default: "opencrvs"
diff --git a/.github/workflows/k8s-reindex.yml b/.github/workflows/k8s-reindex.yml
@@ -9,7 +9,9 @@ on:
         default: "dev"
         type: choice
         options:
-          - ""
+          - demo1
+          - production
+          - staging
   workflow_call:
     inputs:
       environment:
diff --git a/.github/workflows/k8s-reset-data.yml b/.github/workflows/k8s-reset-data.yml
@@ -9,7 +9,9 @@ on:
         default: "dev"
         type: choice
         options:
-          - ""
+          - demo1
+          - production
+          - staging
   workflow_call:
     inputs:
       environment:
diff --git a/.github/workflows/k8s-seed-data.yml b/.github/workflows/k8s-seed-data.yml
@@ -9,7 +9,9 @@ on:
         default: "dev"
         type: choice
         options:
-          - ""
+          - demo1
+          - production
+          - staging
   workflow_call:
     inputs:
       environment:
diff --git a/.github/workflows/provision.yml b/.github/workflows/provision.yml
@@ -9,7 +9,9 @@ on:
         default: 'dev'
         type: choice
         options:
-          - ""
+          - staging
+          - production
+          - demo1
       tags:
         description: 'Tags to apply to the provisioned resources'
         required: true
diff --git a/.github/workflows/reset-2fa.yml b/.github/workflows/reset-2fa.yml
@@ -13,7 +13,9 @@ on:
         default: 
         required: true
         options:
-          - ""
+          - staging
+          - production
+          - demo1
 
 jobs:
   approve:
diff --git a/charts/dependencies/files/beats/metricbeat.yml b/charts/dependencies/files/beats/metricbeat.yml
@@ -29,6 +29,9 @@ metricbeat.modules:
     - core
     - socket
   period: 1m
+  processors:
+    - drop_fields:
+      fields: ["metricset.module", "host.os.build"]
 - module: system
   metricsets:
     - filesystem
diff --git a/environments/demo1/dependencies/values.yaml b/environments/demo1/dependencies/values.yaml
@@ -0,0 +1,25 @@
+storage_type: host_path
+
+environment_type: non-production
+
+ingress:
+  tls_resolver: letsencrypt
+
+minio:
+  use_default_credentials: false
+
+elasticsearch:
+  use_default_credentials: false
+
+mongodb:
+  use_default_credentials: false
+
+postgres:
+  use_default_credentials: false
+
+monitoring:
+  enabled: true
+
+elastalert:
+  env:
+    HTTP_POST2_ALERT_URL: http://countryconfig.opencrvs-demo2.svc.cluster.local:3040
diff --git a/environments/demo1/mosip-api/values.yaml b/environments/demo1/mosip-api/values.yaml
@@ -0,0 +1,2 @@
+ingress:
+  ssl_enabled: true
diff --git a/environments/demo1/opencrvs-services/values.yaml b/environments/demo1/opencrvs-services/values.yaml
@@ -0,0 +1,56 @@
+########################################################################################
+# Initial configuration file for OpenCRVS installation
+########################################################################################
+# Some properties are not defined in this file and should be provided as key/value at
+# installation time:
+# - hostname: valid DNS name for opencrvs
+# - countryconfig.image.name: Countryconfig image repository
+# - countryconfig.image.tag: Countryconfig image tag
+ingress:
+  tls_resolver: letsencrypt
+
+environment_type: non-production
+
+hpa:
+  enabled: false
+
+env:
+  APN_SERVICE_URL: "http://apm-server.opencrvs-deps-demo1.svc.cluster.local:8200"
+
+influxdb:
+  host: influxdb-0.influxdb.opencrvs-deps-demo1.svc.cluster.local
+elasticsearch:
+  auth_mode: auto
+  host: elasticsearch.opencrvs-deps-demo1.svc.cluster.local
+
+
+minio:
+  auth_mode: use_secret
+  host: minio-0.minio.opencrvs-deps-demo1.svc.cluster.local
+  external_hostname: minio.test-k8s.opencrvs.dev
+
+mongodb:
+  auth_mode: auto
+  host: mongodb-0.mongodb.opencrvs-deps-demo1.svc.cluster.local
+
+redis:
+  auth_mode: acl
+  host: redis-0.redis.opencrvs-deps-demo1.svc.cluster.local
+
+postgres:
+  auth_mode: auto
+  host: postgres-0.postgres.opencrvs-deps-demo1.svc.cluster.local
+
+imagePullSecrets:
+  # Default value for credentials created while yarn environment:init
+  - name: dockerhub-credentials
+
+countryconfig:
+  smtp-config:
+    - ALERT_EMAIL
+    - SENDER_EMAIL_ADDRESS
+    - SMTP_HOST
+    - SMTP_PASSWORD
+    - SMTP_PORT
+    - SMTP_SECURE
+    - SMTP_USERNAME
diff --git a/environments/demo1/traefik/values.yaml b/environments/demo1/traefik/values.yaml
@@ -0,0 +1,72 @@
+# Overwriting https://github.com/traefik/traefik-helm-chart/blob/master/traefik/values.yaml
+namespaceOverride: "traefik"
+logs:
+  general:
+    # "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL", "PANIC"
+    level: "INFO"
+    # format: "common" # For local environment
+    format: "json" # For server environment
+  access:
+    # -- To enable access logs
+    enabled: true
+    format: "json"
+
+ingressRoute:
+  dashboard:
+    enabled: false
+
+# Be explicit that we only use CRDs, not ingress/gw support
+providers: 
+  kubernetesCRD:
+    enabled: true
+  kubernetesIngress:
+    enabled: false
+  kubernetesGateway:
+    enabled: false
+
+service:
+  enabled: true
+  single: false
+  type: NodePort
+
+ports:
+  web:
+    port: 8000
+    hostPort: 80
+    protocol: TCP
+    nodePort: 30080
+  websecure:
+    port: 8443
+    nodePort: 30443
+    hostPort: 443
+    protocol: TCP
+
+certificatesResolvers:
+  letsencrypt:
+    acme:
+      tlsChallenge: false
+      httpChallenge:
+        entryPoint: web
+      email: vadym@opencrvs.org
+      # Storage for certificates:
+      storage: /certificates/acme.json
+      # NOTE: Sometimes Let's Encrypt hit production SSL certificate issuing limits
+      #       If you are having issues, switch to staging
+      # Staging server
+      # caServer: https://acme-staging-v02.api.letsencrypt.org/directory
+      # Production server
+      caServer: https://acme-v02.api.letsencrypt.org/directory
+
+deployment:
+  hostNetwork: true
+  additionalVolumes:
+    - name: acme
+      hostPath:
+        path: /data/traefik
+
+additionalVolumeMounts:
+    - name: acme
+      mountPath: /certificates
+
+nodeSelector:
+  traefik-role: ingress
diff --git a/environments/production/dependencies/values.yaml b/environments/production/dependencies/values.yaml
@@ -0,0 +1,31 @@
+storage_type: host_path
+
+environment_type: production
+
+ingress:
+  tls_resolver: letsencrypt
+
+minio:
+  use_default_credentials: false
+
+elasticsearch:
+  use_default_credentials: false
+
+mongodb:
+  use_default_credentials: false
+
+postgres:
+  use_default_credentials: false
+
+monitoring:
+  enabled: true
+
+elastalert:
+  env:
+    HTTP_POST2_ALERT_URL: http://countryconfig.opencrvs-production.svc.cluster.local:3040
+
+# Backup configuration
+backup:
+  enabled: true
+  schedule: "0 1 * * *"
+  backup_server_dir: /home/backup/production
diff --git a/environments/production/mosip-api/values.yaml b/environments/production/mosip-api/values.yaml
@@ -0,0 +1,2 @@
+ingress:
+  ssl_enabled: true
diff --git a/environments/production/opencrvs-services/values.yaml b/environments/production/opencrvs-services/values.yaml
@@ -0,0 +1,56 @@
+########################################################################################
+# Initial configuration file for OpenCRVS installation
+########################################################################################
+# Some properties are not defined in this file and should be provided as key/value at
+# installation time:
+# - hostname: valid DNS name for opencrvs
+# - countryconfig.image.name: Countryconfig image repository
+# - countryconfig.image.tag: Countryconfig image tag
+ingress:
+  tls_resolver: letsencrypt
+
+environment_type: production
+
+hpa:
+  enabled: false
+
+env:
+  APN_SERVICE_URL: "http://apm-server.opencrvs-deps-production.svc.cluster.local:8200"
+
+influxdb:
+  host: influxdb-0.influxdb.opencrvs-deps-production.svc.cluster.local
+elasticsearch:
+  auth_mode: auto
+  host: elasticsearch.opencrvs-deps-production.svc.cluster.local
+
+
+minio:
+  auth_mode: use_secret
+  host: minio-0.minio.opencrvs-deps-production.svc.cluster.local
+  external_hostname: minio.test-k8s.opencrvs.dev
+
+mongodb:
+  auth_mode: auto
+  host: mongodb-0.mongodb.opencrvs-deps-production.svc.cluster.local
+
+redis:
+  auth_mode: acl
+  host: redis-0.redis.opencrvs-deps-production.svc.cluster.local
+
+postgres:
+  auth_mode: auto
+  host: postgres-0.postgres.opencrvs-deps-production.svc.cluster.local
+
+imagePullSecrets:
+  # Default value for credentials created while yarn environment:init
+  - name: dockerhub-credentials
+
+countryconfig:
+  smtp-config:
+    - ALERT_EMAIL
+    - SENDER_EMAIL_ADDRESS
+    - SMTP_HOST
+    - SMTP_PASSWORD
+    - SMTP_PORT
+    - SMTP_SECURE
+    - SMTP_USERNAME
diff --git a/environments/production/traefik/values.yaml b/environments/production/traefik/values.yaml
diff --git a/environments/staging/dependencies/values.yaml b/environments/staging/dependencies/values.yaml
diff --git a/environments/staging/mosip-api/values.yaml b/environments/staging/mosip-api/values.yaml
diff --git a/environments/staging/opencrvs-services/values.yaml b/environments/staging/opencrvs-services/values.yaml
diff --git a/environments/staging/traefik/values.yaml b/environments/staging/traefik/values.yaml
diff --git a/infrastructure/server-setup/inventory/demo1.yml b/infrastructure/server-setup/inventory/demo1.yml
diff --git a/infrastructure/server-setup/inventory/production.yml b/infrastructure/server-setup/inventory/production.yml
diff --git a/infrastructure/server-setup/inventory/staging.yml b/infrastructure/server-setup/inventory/staging.yml
