diff --git a/helm/capif/charts/mock-server/templates/deployment.yaml b/helm/capif/charts/mock-server/templates/deployment.yaml index 89261d75df3226ecd5bcf82cb307a3ddc227ec49..ea29ba94434dfcc6cf7d9eb2a30317305f775637 100644 --- a/helm/capif/charts/mock-server/templates/deployment.yaml +++ b/helm/capif/charts/mock-server/templates/deployment.yaml @@ -41,6 +41,9 @@ spec: - name: http containerPort: {{ .Values.service.port }} protocol: TCP + env: + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/mock-server/values.yaml b/helm/capif/charts/mock-server/values.yaml index cd2dfc077a7f182c31d06a0b6cee8556e1e11b30..a34433aa97c060faddc1e412f8d93c791b3bdf75 100644 --- a/helm/capif/charts/mock-server/values.yaml +++ b/helm/capif/charts/mock-server/values.yaml @@ -16,6 +16,9 @@ imagePullSecrets: [] nameOverride: "" fullnameOverride: "" +env: + logLevel: "INFO" + serviceAccount: # Specifies whether a service account should be created create: true diff --git a/helm/capif/charts/mongo/values.yaml b/helm/capif/charts/mongo/values.yaml index 53b8cf5f9bff46c918a9354c1e2f2f56eba1419f..38e4b9b9846ca5c27bb74899c3113a77a6b804dc 100644 --- a/helm/capif/charts/mongo/values.yaml +++ b/helm/capif/charts/mongo/values.yaml @@ -113,4 +113,4 @@ nodeSelector: {} tolerations: [] -affinity: {} +affinity: {} \ No newline at end of file diff --git a/helm/capif/charts/nginx/templates/deployment.yaml b/helm/capif/charts/nginx/templates/deployment.yaml index a5cd26c2c5e54fea61f31bd53f2987d9f17de38f..221ebfd0a234ca4c12cf90abf9d9d1518b64c9cb 100644 --- a/helm/capif/charts/nginx/templates/deployment.yaml +++ b/helm/capif/charts/nginx/templates/deployment.yaml @@ -48,6 +48,8 @@ spec: value: {{ quote .Values.env.vaultPort }} - name: VAULT_ACCESS_TOKEN value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/nginx/values.yaml b/helm/capif/charts/nginx/values.yaml index e3ba0017e40dce2172b03a16dd6ed055e8e1782a..db0541e9b82c3cf135ece746b3815f84cb6c9b25 100644 --- a/helm/capif/charts/nginx/values.yaml +++ b/helm/capif/charts/nginx/values.yaml @@ -19,6 +19,7 @@ env: vaultHostname: vault-internal.mon.svc.cluster.local vaultPort: 8200 vaultAccessToken: dev-only-token + logLevel: "info" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-access-control-policy/templates/deployment.yaml b/helm/capif/charts/ocf-access-control-policy/templates/deployment.yaml index 3a8000f6561260d6f6edb0383d1dc63c37700dea..987f20960b1b7b5133f83925c40969734efde1a4 100644 --- a/helm/capif/charts/ocf-access-control-policy/templates/deployment.yaml +++ b/helm/capif/charts/ocf-access-control-policy/templates/deployment.yaml @@ -43,6 +43,8 @@ spec: value: {{ quote .Values.env.capifHostname }} - name: MONITORING value: {{ quote .Values.env.monitoring }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-access-control-policy/values.yaml b/helm/capif/charts/ocf-access-control-policy/values.yaml index 2912e0961adbbca1982cdcb049647d056547c7d4..9184d264b10da5022f4ce435f902c50c64522e0c 100644 --- a/helm/capif/charts/ocf-access-control-policy/values.yaml +++ b/helm/capif/charts/ocf-access-control-policy/values.yaml @@ -17,6 +17,7 @@ fullnameOverride: "" env: capifHostname: my-capif.apps.ocp-epg.hi.inet monitoring: "true" + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-api-invocation-logs/templates/deployment.yaml b/helm/capif/charts/ocf-api-invocation-logs/templates/deployment.yaml index fc3ce110e4f872c389118d39a60967f90cd72132..b0262fe0dfe21e7b354b07747e191d24a18e672e 100644 --- a/helm/capif/charts/ocf-api-invocation-logs/templates/deployment.yaml +++ b/helm/capif/charts/ocf-api-invocation-logs/templates/deployment.yaml @@ -49,7 +49,9 @@ spec: - name: VAULT_PORT value: {{ quote .Values.env.vaultPort }} - name: VAULT_ACCESS_TOKEN - value: {{ quote .Values.env.vaultAccessToken }} + value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-api-invocation-logs/values.yaml b/helm/capif/charts/ocf-api-invocation-logs/values.yaml index 4c4431b3ff7c326f162fe590a1d63404347f7d8b..dc63d4b53ae11261428458a7926bf39fbf14815b 100644 --- a/helm/capif/charts/ocf-api-invocation-logs/values.yaml +++ b/helm/capif/charts/ocf-api-invocation-logs/values.yaml @@ -22,6 +22,7 @@ env: vaultAccessToken: dev-only-token mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-api-invoker-management/templates/deployment.yaml b/helm/capif/charts/ocf-api-invoker-management/templates/deployment.yaml index c4fd0c90e42af849b4752f69d731b58dceb84429..5b210cb25b01f71318975a84bd89256b11183b44 100644 --- a/helm/capif/charts/ocf-api-invoker-management/templates/deployment.yaml +++ b/helm/capif/charts/ocf-api-invoker-management/templates/deployment.yaml @@ -47,7 +47,9 @@ spec: - name: VAULT_PORT value: {{ quote .Values.env.vaultPort }} - name: VAULT_ACCESS_TOKEN - value: {{ quote .Values.env.vaultAccessToken }} + value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-api-invoker-management/values.yaml b/helm/capif/charts/ocf-api-invoker-management/values.yaml index a296a41ebc0c2ff6a1b63e3d60fea141ed90634b..e832c7d4ed28cd21113a6f367e2c9cbcfeb3af03 100644 --- a/helm/capif/charts/ocf-api-invoker-management/values.yaml +++ b/helm/capif/charts/ocf-api-invoker-management/values.yaml @@ -21,6 +21,7 @@ env: vaultAccessToken: dev-only-token mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" mongoRegister: mongoInitdbRootUsername: root mongoInitdbRootPassword: example diff --git a/helm/capif/charts/ocf-api-provider-management/templates/deployment.yaml b/helm/capif/charts/ocf-api-provider-management/templates/deployment.yaml index c5ff21561990396b8de2ef6d0ec471778551ccdf..7f95b9d602eb70ce4eeb5b34df18d506eef47d1b 100644 --- a/helm/capif/charts/ocf-api-provider-management/templates/deployment.yaml +++ b/helm/capif/charts/ocf-api-provider-management/templates/deployment.yaml @@ -47,7 +47,9 @@ spec: - name: VAULT_PORT value: {{ quote .Values.env.vaultPort }} - name: VAULT_ACCESS_TOKEN - value: {{ quote .Values.env.vaultAccessToken }} + value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-api-provider-management/values.yaml b/helm/capif/charts/ocf-api-provider-management/values.yaml index 019b2147a682048338465dca7aef8f492efe37c0..547bb05431771b6e9a3668f7b133119781e8b4a7 100644 --- a/helm/capif/charts/ocf-api-provider-management/values.yaml +++ b/helm/capif/charts/ocf-api-provider-management/values.yaml @@ -21,6 +21,7 @@ env: vaultAccessToken: dev-only-token mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" mongoRegister: mongoInitdbRootUsername: root mongoInitdbRootPassword: example diff --git a/helm/capif/charts/ocf-auditing-api-logs/templates/deployment.yaml b/helm/capif/charts/ocf-auditing-api-logs/templates/deployment.yaml index 62cbf03437043bc836644bd03caa8de738591cd7..8248606b8385e819a3df8b58513685c2c5c004fd 100644 --- a/helm/capif/charts/ocf-auditing-api-logs/templates/deployment.yaml +++ b/helm/capif/charts/ocf-auditing-api-logs/templates/deployment.yaml @@ -42,6 +42,8 @@ spec: env: - name: MONITORING value: {{ quote .Values.env.monitoring }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-auditing-api-logs/values.yaml b/helm/capif/charts/ocf-auditing-api-logs/values.yaml index 41e3d1f3d729274009e6cda6a073744fd99e347c..859ba129d567caf4b1ca047d05e531a9bcddf3ea 100644 --- a/helm/capif/charts/ocf-auditing-api-logs/values.yaml +++ b/helm/capif/charts/ocf-auditing-api-logs/values.yaml @@ -18,6 +18,7 @@ env: monitoring: "true" mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-discover-service-api/templates/deployment.yaml b/helm/capif/charts/ocf-discover-service-api/templates/deployment.yaml index 438b986efee0e73d3f4eb08082df552cd25226e5..0c6bfb02fe9fdf8376c865e33f7ee64b19447399 100644 --- a/helm/capif/charts/ocf-discover-service-api/templates/deployment.yaml +++ b/helm/capif/charts/ocf-discover-service-api/templates/deployment.yaml @@ -42,6 +42,8 @@ spec: env: - name: MONITORING value: {{ quote .Values.env.monitoring }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-discover-service-api/values.yaml b/helm/capif/charts/ocf-discover-service-api/values.yaml index b69232d43c9b79e0a8b9bb91280325501074f064..6aa8e611bff38c395604f22d17b730663905b8a6 100644 --- a/helm/capif/charts/ocf-discover-service-api/values.yaml +++ b/helm/capif/charts/ocf-discover-service-api/values.yaml @@ -18,6 +18,7 @@ env: monitoring: "true" mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-events/templates/deployment.yaml b/helm/capif/charts/ocf-events/templates/deployment.yaml index f94cc7b32c02fb294bc6b9a9279dae971c51f01c..50b58cc909d0f3878268457fa6d6610066e0ceb9 100644 --- a/helm/capif/charts/ocf-events/templates/deployment.yaml +++ b/helm/capif/charts/ocf-events/templates/deployment.yaml @@ -42,6 +42,8 @@ spec: env: - name: MONITORING value: {{ quote .Values.env.monitoring }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-events/values.yaml b/helm/capif/charts/ocf-events/values.yaml index c600141fb9749a200cd799acbd0cea05425b2eb6..b3ca6b0cdef9cf244e733e986365e0b7853b0334 100644 --- a/helm/capif/charts/ocf-events/values.yaml +++ b/helm/capif/charts/ocf-events/values.yaml @@ -18,6 +18,7 @@ env: monitoring: "true" mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-helper/templates/deployment.yaml b/helm/capif/charts/ocf-helper/templates/deployment.yaml index 7c55930fd015356cfec4f549abe6d1911a688b7b..16f43a0226d2d4d580799ee5252f46a4820c0712 100644 --- a/helm/capif/charts/ocf-helper/templates/deployment.yaml +++ b/helm/capif/charts/ocf-helper/templates/deployment.yaml @@ -58,6 +58,8 @@ spec: value: {{ quote .Values.env.vaultPort }} - name: VAULT_ACCESS_TOKEN value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} {{- with .Values.volumes }} volumes: {{- toYaml . | nindent 8 }} diff --git a/helm/capif/charts/ocf-helper/values.yaml b/helm/capif/charts/ocf-helper/values.yaml index 36e0989056b2d8a7533366b968e19ce3777ac098..f9e35bdb8134283ce065ef657e496f6d1c0336e2 100644 --- a/helm/capif/charts/ocf-helper/values.yaml +++ b/helm/capif/charts/ocf-helper/values.yaml @@ -22,7 +22,8 @@ env: mongoPort: 27017 capifHostname: capif mongoInitdbRootUsername: root - mongoInitdbRootPassword: example + mongoInitdbRootPassword: example + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-publish-service-api/templates/deployment.yaml b/helm/capif/charts/ocf-publish-service-api/templates/deployment.yaml index 49d9b2ce59795993bc4dbe0e674eaaa7d0d91036..ceced651510218511744d9148811ee35f07fa01d 100644 --- a/helm/capif/charts/ocf-publish-service-api/templates/deployment.yaml +++ b/helm/capif/charts/ocf-publish-service-api/templates/deployment.yaml @@ -42,6 +42,8 @@ spec: env: - name: MONITORING value: {{ quote .Values.env.monitoring }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-publish-service-api/values.yaml b/helm/capif/charts/ocf-publish-service-api/values.yaml index 4ab3c9cdabb7402d37e70fcd629530818542865b..ac32a9800a93bbb7cbf2a2125cf2b6668608805d 100644 --- a/helm/capif/charts/ocf-publish-service-api/values.yaml +++ b/helm/capif/charts/ocf-publish-service-api/values.yaml @@ -18,6 +18,7 @@ env: monitoring: "true" mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-register/templates/deployment.yaml b/helm/capif/charts/ocf-register/templates/deployment.yaml index 5437dfc807f8ff527ec322b5be3260bc41eb8e1a..0009f19fd1e709ea12b9072ff0b7938c14f90692 100644 --- a/helm/capif/charts/ocf-register/templates/deployment.yaml +++ b/helm/capif/charts/ocf-register/templates/deployment.yaml @@ -46,6 +46,8 @@ spec: value: {{ quote .Values.env.vaultPort }} - name: VAULT_ACCESS_TOKEN value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-register/values.yaml b/helm/capif/charts/ocf-register/values.yaml index 5605ef8621f683bd734a5786583c57554c33c045..ca8cfc3f43551526356ebf2250762c5f7c9c9d69 100644 --- a/helm/capif/charts/ocf-register/values.yaml +++ b/helm/capif/charts/ocf-register/values.yaml @@ -21,7 +21,8 @@ env: vaultPort: 8200 vaultAccessToken: dev-only-token capifHostname: capif-test.example.int - + logLevel: "INFO" + serviceAccount: # Specifies whether a service account should be created create: true diff --git a/helm/capif/charts/ocf-routing-info/templates/deployment.yaml b/helm/capif/charts/ocf-routing-info/templates/deployment.yaml index 2e1abf12f28390b5812c3f5611d2b03a3160b7fb..214f38fbe1ebbf4c451e6ee5e189a9981f49a8fe 100644 --- a/helm/capif/charts/ocf-routing-info/templates/deployment.yaml +++ b/helm/capif/charts/ocf-routing-info/templates/deployment.yaml @@ -41,6 +41,8 @@ spec: env: - name: MONITORING value: {{ quote .Values.env.monitoring }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-routing-info/values.yaml b/helm/capif/charts/ocf-routing-info/values.yaml index 8ba779c4f755f170bc7d2dc9ba32ffa1ed7e18ae..d6c6a3d63c48e8d517347f2c1df70704b218ee56 100644 --- a/helm/capif/charts/ocf-routing-info/values.yaml +++ b/helm/capif/charts/ocf-routing-info/values.yaml @@ -16,6 +16,7 @@ fullnameOverride: "" env: monitoring: "true" + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/capif/charts/ocf-security/templates/deployment.yaml b/helm/capif/charts/ocf-security/templates/deployment.yaml index 44bd7fa9c30c93875e619c25df6c4512ced6ef50..48ab76404d940062fcc5cfd0ba3f53224050535a 100644 --- a/helm/capif/charts/ocf-security/templates/deployment.yaml +++ b/helm/capif/charts/ocf-security/templates/deployment.yaml @@ -50,6 +50,8 @@ spec: value: {{ quote .Values.env.vaultPort }} - name: VAULT_ACCESS_TOKEN value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/capif/charts/ocf-security/values.yaml b/helm/capif/charts/ocf-security/values.yaml index 37b57c71183d98612f5f74690879914f734951ad..2be42885aacd8679b17ab198c6affe89c727f485 100644 --- a/helm/capif/charts/ocf-security/values.yaml +++ b/helm/capif/charts/ocf-security/values.yaml @@ -22,6 +22,7 @@ env: vaultAccessToken: dev-only-token mongoInitdbRootUsername: root mongoInitdbRootPassword: example + logLevel: "INFO" serviceAccount: # Specifies whether a service account should be created diff --git a/helm/vault-job/vault-job.yaml b/helm/vault-job/vault-job.yaml index 84b247fc65ad091304fbdb6d8bd832b631ef2e54..a68f2f9eb0c1e142be88606b3ea246cf97748cd5 100644 --- a/helm/vault-job/vault-job.yaml +++ b/helm/vault-job/vault-job.yaml @@ -76,7 +76,7 @@ data: vault write pki_int/intermediate/set-signed certificate=@capif_intermediate.cert.pem #Crear rol en Vault - vault write pki_int/roles/my-ca use_csr_common_name=true require_cn=false allowed_domains="*" allow_any_name=true allow_bare_domains=true allow_glob_domains=true allow_subdomains=true max_ttl=4300h ttl=4300h + vault write pki_int/roles/my-ca use_csr_common_name=false require_cn=false allowed_domains="*" allow_any_name=true allow_bare_domains=true allow_glob_domains=true allow_subdomains=true max_ttl=4300h ttl=4300h # Emitir un certificado firmado por la CA intermedia # vault write -format=json pki_int/issue/my-ca \