chore: sync from governance-studio-infrastructure @ f2c78b0

github-actions[bot] · github-actions[bot] · commit 07fc6bf51d52 · 2026-06-03T12:31:09.000Z
Updated: charts govctl Source: eqtylab/governance-studio-infrastructure@f2c78b0
diff --git a/charts/auth-service/README.md b/charts/auth-service/README.md
@@ -18,6 +18,8 @@ Key capabilities:
 
 Auth Service uses runtime configuration injected via environment variables. Application configuration is provided through Helm values and injected into the container at startup.
 
+The container also receives a `SERVICE_VERSION` environment variable, auto-populated from `Chart.Version`. This is intended for display and observability purposes and is not user-configurable.
+
 This allows:
 
 - A single immutable container image across environments
@@ -456,11 +458,11 @@ All secret references support global fallbacks when deployed via umbrella chart.
 
 #### Logging Configuration
 
-| Key                      | Type   | Default                                         | Description                       |
-| ------------------------ | ------ | ----------------------------------------------- | --------------------------------- |
-| config.logging.level     | string | `"info"`                                        | Log level (debug/info/warn/error) |
-| config.logging.format    | string | `"json"`                                        | Log format (json/text)            |
-| config.logging.skipPaths | string | `"/health,/health/live,/health/ready,/metrics"` | Paths to skip in logs             |
+| Key                      | Type   | Default                                | Description                       |
+| ------------------------ | ------ | -------------------------------------- | --------------------------------- |
+| config.logging.level     | string | `"info"`                               | Log level (debug/info/warn/error) |
+| config.logging.format    | string | `"json"`                               | Log format (json/text)            |
+| config.logging.skipPaths | string | `"/health,/health/live,/health/ready"` | Paths to skip in logs             |
 
 #### CORS Configuration
 
@@ -486,7 +488,6 @@ All secret references support global fallbacks when deployed via umbrella chart.
 | config.idp.auth0.apiIdentifier          | string | `""`                                 | API identifier (**must be set**)                                              |
 | config.idp.auth0.defaultConnection      | string | `"Username-Password-Authentication"` | Default connection                                                            |
 | config.idp.auth0.defaultRoles           | list   | `["user"]`                           | Default roles for new users                                                   |
-| config.idp.auth0.sendInvitationEmail    | bool   | `true`                               | Send invitation email on user creation                                        |
 | config.idp.auth0.clientId               | string | `""`                                 | Auth0 client ID (auto-configured from global.secrets.auth.auth0)              |
 | config.idp.auth0.clientSecret           | string | `""`                                 | Auth0 client secret (auto-configured from global.secrets.auth.auth0)          |
 | config.idp.auth0.managementClientId     | string | `""`                                 | Management API client ID (auto-configured from global.secrets.auth.auth0)     |
@@ -559,18 +560,6 @@ Token exchange is only relevant for Keycloak deployments using federated authent
 | config.tokenExchange.keyId      | string | `"auth-service-prod-001"` | Key identifier for signing key                                                 |
 | config.tokenExchange.privateKey | string | `""`                      | Token exchange private key (auto-configured from global.secrets.auth.keycloak) |
 
-### Metrics Configuration
-
-| Key                                  | Type   | Default      | Description                      |
-| ------------------------------------ | ------ | ------------ | -------------------------------- |
-| metrics.enabled                      | bool   | `false`      | Enable Prometheus metrics        |
-| metrics.port                         | int    | `9090`       | Metrics port                     |
-| metrics.path                         | string | `"/metrics"` | Metrics path                     |
-| metrics.serviceMonitor.enabled       | bool   | `false`      | Enable ServiceMonitor            |
-| metrics.serviceMonitor.interval      | string | `"30s"`      | Scrape interval                  |
-| metrics.serviceMonitor.scrapeTimeout | string | `"10s"`      | Scrape timeout                   |
-| metrics.serviceMonitor.labels        | object | `{}`         | Additional ServiceMonitor labels |
-
 ### Advanced: Network Policy Configuration
 
 | Key                   | Type | Default         | Description          |
diff --git a/charts/auth-service/templates/configmap.yaml b/charts/auth-service/templates/configmap.yaml
@@ -12,6 +12,7 @@ data:
   PORT: "{{ .Values.config.server.port }}"
   HOST: "{{ .Values.config.server.host }}"
   ENVIRONMENT: "{{ .Values.config.server.environment | default ((.Values.global).environmentType) | default "production" }}"
+  SERVICE_VERSION: {{ .Chart.Version | quote }}
   AUTH_SERVICE_URL: {{ .Values.config.server.authServiceUrl | default (printf "http://%s-auth-service:%s/api/v1/auth" .Release.Name (toString .Values.config.server.port)) | quote }}
   SWAGGER_ENABLED: "{{ .Values.config.server.swaggerEnabled }}"
   {{- if .Values.config.server.swaggerEnabled }}
@@ -39,9 +40,9 @@ data:
   DB_PORT: "{{ .Values.externalDatabase.port | default ((.Values.global).postgresql).port | default 5432 }}"
   DB_NAME: "{{ .Values.externalDatabase.name | default ((.Values.global).postgresql).database | default "governance" }}"
   DB_USER: "{{ .Values.externalDatabase.user | default ((.Values.global).postgresql).username | default "postgres" }}"
-  DB_SSL_MODE: "{{ .Values.externalDatabase.sslMode | default ((.Values.global).postgresql).sslMode | default "disable" }}"
-  DATABASE_AUTO_MIGRATE: "{{ .Values.migrations.runAtStartup }}"
-  DATABASE_MIGRATIONS_PATH: "{{ .Values.migrations.path }}"
+  DB_SSLMODE: "{{ .Values.externalDatabase.sslMode | default ((.Values.global).postgresql).sslMode | default "disable" }}"
+  MIGRATIONS_RUN_AT_STARTUP: "{{ .Values.migrations.runAtStartup }}"
+  MIGRATIONS_PATH: "{{ .Values.migrations.path }}"
 
   # ==========================================================================
   # Identity Provider Configuration
@@ -67,7 +68,6 @@ data:
   {{- end }}
   IDP_AUTH0_DEFAULT_CONNECTION: "{{ .Values.config.idp.auth0.defaultConnection }}"
   IDP_AUTH0_DEFAULT_ROLES: "{{ .Values.config.idp.auth0.defaultRoles | join "," }}"
-  IDP_AUTH0_SEND_INVITATION_EMAIL: "{{ .Values.config.idp.auth0.sendInvitationEmail }}"
   {{- end }}
 
   {{- if eq $idpProvider "keycloak" }}
@@ -165,14 +165,4 @@ data:
   # ==========================================================================
   AUTH_SERVICE_KEY_ID: "{{ .Values.config.tokenExchange.keyId }}"
   {{- end }}
-
-  {{- if .Values.metrics.enabled }}
-  
-  # ==========================================================================
-  # Metrics Configuration
-  # ==========================================================================
-  METRICS_ENABLED: "true"
-  METRICS_PORT: "{{ .Values.metrics.port }}"
-  METRICS_PATH: "{{ .Values.metrics.path }}"
-  {{- end }}
 {{- end }}
diff --git a/charts/auth-service/templates/deployment.yaml b/charts/auth-service/templates/deployment.yaml
@@ -100,11 +100,6 @@ spec:
             - name: http
               containerPort: {{ .Values.config.server.port }}
               protocol: TCP
-            {{- if .Values.metrics.enabled }}
-            - name: metrics
-              containerPort: {{ .Values.metrics.port }}
-              protocol: TCP
-            {{- end }}
           envFrom:
             - configMapRef:
                 name: {{ include "auth-service.fullname" . }}
diff --git a/charts/auth-service/templates/migration-job.yaml b/charts/auth-service/templates/migration-job.yaml
@@ -53,14 +53,14 @@ spec:
                   name: {{ .Values.externalDatabase.passwordSecretKeyRef.name | default ((.Values.global.secrets).database).secretName | quote }}
                   key: {{ .Values.externalDatabase.passwordSecretKeyRef.key | default ((.Values.global.secrets).database).keys.password | default "password" | quote }}
               {{- end }}
-            - name: DB_SSL_MODE
+            - name: DB_SSLMODE
               value: {{ .Values.externalDatabase.sslMode | default ((.Values.global).postgresql).sslMode | default "disable" | quote }}
             {{- $pgSslRootCert := (((.Values.global).postgresql).sslRootCert) | default dict }}
             {{- if or $pgSslRootCert.secretName $pgSslRootCert.configMapName }}
             - name: PGSSLROOTCERT
               value: {{ printf "/etc/ssl/postgres/%s" ($pgSslRootCert.key | default "ca.crt") | quote }}
             {{- end }}
-            - name: DATABASE_MIGRATIONS_PATH
+            - name: MIGRATIONS_PATH
               value: {{ .Values.migrations.path | quote }}
           {{- with .Values.migration.resources }}
           resources:
diff --git a/charts/auth-service/templates/service.yaml b/charts/auth-service/templates/service.yaml
@@ -12,12 +12,6 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
-    {{- if .Values.metrics.enabled }}
-    - port: {{ .Values.metrics.port }}
-      targetPort: metrics
-      protocol: TCP
-      name: metrics
-    {{- end }}
   selector:
     {{- include "auth-service.selectorLabels" . | nindent 4 }}
 {{- end }}
diff --git a/charts/auth-service/templates/servicemonitor.yaml b/charts/auth-service/templates/servicemonitor.yaml
diff --git a/charts/auth-service/values.yaml b/charts/auth-service/values.yaml
@@ -459,9 +459,9 @@ config:
     # Options: json, text
     format: "json"
     # -- Skip Paths
-    # @default -- `/health,/health/live,/health/ready,/metrics`
+    # @default -- `/health,/health/live,/health/ready`
     # Paths to skip in access logs
-    skipPaths: "/health,/health/live,/health/ready,/metrics"
+    skipPaths: "/health,/health/live,/health/ready"
 
   # ---------------------------------------------------------------------------
   # CORS Configuration
@@ -522,10 +522,6 @@ config:
       # Default roles for new users
       defaultRoles:
         - user
-      # -- Send Invitation Email
-      # @default -- `true`
-      # Send invitation email on user creation
-      sendInvitationEmail: true
       # -- Client ID
       # @default -- `""` (auto-configured from global.secrets.auth.auth0)
       # Only used when provider is "auth0"
@@ -744,43 +740,6 @@ config:
     # Only used when tokenExchange is enabled
     privateKey: ""
 
-# =============================================================================
-# METRICS CONFIGURATION
-# =============================================================================
-
-# -- Metrics Configuration
-# @default -- See values below
-metrics:
-  # -- Enabled
-  # @default -- `false`
-  # Enable Prometheus metrics
-  enabled: false
-  # -- Port
-  # @default -- `9090`
-  port: 9090
-  # -- Path
-  # @default -- `/metrics`
-  path: "/metrics"
-
-  # -- Service Monitor
-  # @default -- See values below
-  serviceMonitor:
-    # -- Enabled
-    # @default -- `false`
-    # Enable ServiceMonitor for Prometheus Operator
-    enabled: false
-    # -- Interval
-    # @default -- `30s`
-    # Scrape interval
-    interval: "30s"
-    # -- Scrape Timeout
-    # @default -- `10s`
-    scrapeTimeout: "10s"
-    # -- Labels
-    # @default -- `{}`
-    # Additional labels for ServiceMonitor
-    labels: {}
-
 # =============================================================================
 # NETWORK POLICY CONFIGURATION
 # =============================================================================
diff --git a/charts/governance-platform/README.md b/charts/governance-platform/README.md
@@ -520,7 +520,7 @@ governance-studio:
 
 governance-service:
   enabled: true
-  # config.appEnv automatically becomes: production
+  # config.environment automatically becomes: production
   # Database credentials auto-configured from global.secrets.database
   # Storage credentials auto-configured from global.secrets.storage
 
diff --git a/charts/governance-platform/values.yaml b/charts/governance-platform/values.yaml
@@ -832,9 +832,9 @@ auth-service:
       # Options: json, text
       format: "json"
       # -- Skip Paths
-      # @default -- `/health,/health/live,/health/ready,/metrics`
+      # @default -- `/health,/health/live,/health/ready`
       # Paths to skip in access logs
-      skipPaths: "/health,/health/live,/health/ready,/metrics"
+      skipPaths: "/health,/health/live,/health/ready"
 
     # ---------------------------------------------------------------------------
     # CORS Configuration
@@ -895,10 +895,6 @@ auth-service:
         # Default roles for new users
         defaultRoles:
           - user
-        # -- Send Invitation Email
-        # @default -- `true`
-        # Send invitation email on user creation
-        sendInvitationEmail: true
         # -- Client ID
         # @default -- `""` (auto-configured from global.secrets.auth.auth0)
         # Only used when provider is "auth0"
@@ -1113,43 +1109,6 @@ auth-service:
       # Only used when tokenExchange is enabled
       privateKey: ""
 
-  # =============================================================================
-  # METRICS CONFIGURATION
-  # =============================================================================
-
-  # -- Metrics Configuration
-  # @default -- See values below
-  metrics:
-    # -- Enabled
-    # @default -- `false`
-    # Enable Prometheus metrics
-    enabled: false
-    # -- Port
-    # @default -- `9090`
-    port: 9090
-    # -- Path
-    # @default -- `/metrics`
-    path: "/metrics"
-
-    # -- Service Monitor
-    # @default -- See values below
-    serviceMonitor:
-      # -- Enabled
-      # @default -- `false`
-      # Enable ServiceMonitor for Prometheus Operator
-      enabled: false
-      # -- Interval
-      # @default -- `30s`
-      # Scrape interval
-      interval: "30s"
-      # -- Scrape Timeout
-      # @default -- `10s`
-      scrapeTimeout: "10s"
-      # -- Labels
-      # @default -- `{}`
-      # Additional labels for ServiceMonitor
-      labels: {}
-
   # =============================================================================
   # NETWORK POLICY CONFIGURATION
   # =============================================================================
@@ -1646,13 +1605,18 @@ governance-service:
 
     # -- Application Environment
     # @default -- `""` (auto-configured from global.environmentType, defaults to "development")
-    appEnv: ""
+    environment: ""
 
     # -- Log Level
     # @default -- `info`
     # Options: debug, info, warn, error
     logLevel: "info"
 
+    # -- Log Format
+    # @default -- `json`
+    # Options: json, text, console, pretty
+    logFormat: "json"
+
     # -- Credential Encryption Key
     # @default -- `""` (auto-configured from global.secrets.encryption)
     credentialEncryptionKey: ""
diff --git a/charts/governance-service/README.md b/charts/governance-service/README.md
@@ -17,6 +17,8 @@ Key capabilities:
 
 Governance Service uses runtime configuration injected via environment variables. Application configuration is provided through Helm values and injected into the container at startup.
 
+The container also receives a `SERVICE_VERSION` environment variable, auto-populated from `Chart.Version`. This is intended for display and observability purposes and is not user-configurable.
+
 This allows:
 
 - A single immutable container image across environments
@@ -431,8 +433,9 @@ All config values support global fallbacks when deployed via umbrella chart.
 | Key                            | Type   | Default     | Description                                                           |
 | ------------------------------ | ------ | ----------- | --------------------------------------------------------------------- |
 | config.healthPath              | string | `"/health"` | Health check endpoint path                                            |
-| config.appEnv                  | string | `""`        | Application environment (auto-configured from global.environmentType) |
+| config.environment             | string | `""`        | Application environment (auto-configured from global.environmentType) |
 | config.logLevel                | string | `"info"`    | Logging level (debug/info/warn/error)                                 |
+| config.logFormat               | string | `"json"`    | Log output format (json/text/console/pretty)                          |
 | config.credentialEncryptionKey | string | `""`        | Encryption key (auto-configured from global.secrets.encryption)       |
 
 #### HTTP Server Configuration
diff --git a/charts/governance-service/examples/values-auth0.yaml b/charts/governance-service/examples/values-auth0.yaml
@@ -47,7 +47,7 @@ resources:
 
 config:
   # Application Settings
-  appEnv: "production"
+  environment: "production"
   logLevel: "info"
 
   # Storage Configuration - AWS S3 (uncomment to use instead)
diff --git a/charts/governance-service/examples/values-entra.yaml b/charts/governance-service/examples/values-entra.yaml
@@ -47,7 +47,7 @@ resources:
 
 config:
   # Application Settings
-  appEnv: "production"
+  environment: "production"
   logLevel: "info"
 
   # Storage Configuration - AWS S3 (uncomment to use instead)
diff --git a/charts/governance-service/examples/values-keycloak.yaml b/charts/governance-service/examples/values-keycloak.yaml
@@ -47,7 +47,7 @@ resources:
 
 config:
   # Application Settings
-  appEnv: "production"
+  environment: "production"
   logLevel: "info"
 
   # Storage Configuration - AWS S3 (uncomment to use instead)
diff --git a/charts/governance-service/templates/NOTES.txt b/charts/governance-service/templates/NOTES.txt
@@ -15,7 +15,7 @@ To access the service, you need to enable ingress or use port-forwarding:
 {{- end }}
 
 Configuration:
-  Environment: {{ .Values.config.appEnv | default ((.Values.global).environmentType | default "not set") }}
+  Environment: {{ .Values.config.environment | default ((.Values.global).environmentType | default "not set") }}
   Storage Provider: {{ .Values.config.storageProvider | default "not set" }}
   Log Level: {{ .Values.config.logLevel }}
 
diff --git a/charts/governance-service/templates/configmap.yaml b/charts/governance-service/templates/configmap.yaml
@@ -9,7 +9,8 @@ data:
   # ==========================================================================
   # Server Configuration
   # ==========================================================================
-  SERVER_PORT: "{{ .Values.service.port }}"
+  PORT: "{{ .Values.service.port }}"
+  SERVICE_VERSION: {{ .Chart.Version | quote }}
   SERVER_READ_TIMEOUT_SECONDS: "{{ .Values.config.server.readTimeout }}"
   SERVER_WRITE_TIMEOUT_SECONDS: "{{ .Values.config.server.writeTimeout }}"
   SERVER_IDLE_TIMEOUT_SECONDS: "{{ .Values.config.server.idleTimeout }}"
@@ -23,4 +24,5 @@ data:
   # Logging Configuration
   # ==========================================================================
   LOG_LEVEL: "{{ .Values.config.logLevel }}"
+  LOG_FORMAT: "{{ .Values.config.logFormat }}"
 {{- end }}
diff --git a/charts/governance-service/templates/deployment.yaml b/charts/governance-service/templates/deployment.yaml
diff --git a/charts/governance-service/values.yaml b/charts/governance-service/values.yaml
diff --git a/charts/integrity-service/templates/deployment.yaml b/charts/integrity-service/templates/deployment.yaml
diff --git a/govctl/govctl/generators/sections/governance_service.py b/govctl/govctl/generators/sections/governance_service.py
