From 72fbf8c16328b702e52cb35442bb1be7eabb0fb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:35:29 +0000 Subject: [PATCH 1/7] Bump http-proxy-middleware from 2.0.6 to 2.0.7 Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.6 to 2.0.7. - [Release notes](https://github.com/chimurai/http-proxy-middleware/releases) - [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md) - [Commits](https://github.com/chimurai/http-proxy-middleware/compare/v2.0.6...v2.0.7) --- updated-dependencies: - dependency-name: http-proxy-middleware dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae6907d8..9443c8c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -140,7 +140,7 @@ "dotenv-expand": "^5.1.0", "ee-first": "^1.1.1", "electron-to-chromium": "^1.4.365", - "elliptic": "^6.5.4", + "elliptic": "^6.5.8", "emoji-regex": "^8.0.0", "emojis-list": "^3.0.0", "encodeurl": "^1.0.2", @@ -216,7 +216,7 @@ "http-errors": "^2.0.0", "http-parser-js": "^0.5.8", "http-proxy": "^1.18.1", - "http-proxy-middleware": "^2.0.6", + "http-proxy-middleware": "^2.0.7", "https-browserify": "^1.0.0", "human-signals": "^2.1.0", "iconv-lite": "^0.4.24", @@ -4926,9 +4926,9 @@ "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==" }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz", + "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", @@ -6019,9 +6019,9 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dependencies": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", diff --git a/package.json b/package.json index e43bc143..396f9b2c 100644 --- a/package.json +++ b/package.json @@ -233,7 +233,7 @@ "http-errors": "^2.0.0", "http-parser-js": "^0.5.8", "http-proxy": "^1.18.1", - "http-proxy-middleware": "^2.0.6", + "http-proxy-middleware": "^2.0.7", "https-browserify": "^1.0.0", "human-signals": "^2.1.0", "iconv-lite": "^0.4.24", From 577e49c28518b28ecfd22029515cea02c1032de3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 21:35:31 +0000 Subject: [PATCH 2/7] Bump elliptic from 6.5.7 to 6.6.0 Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.0. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.7...v6.6.0) --- updated-dependencies: - dependency-name: elliptic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index ae6907d8..d09f4581 100644 --- a/package-lock.json +++ b/package-lock.json @@ -140,7 +140,7 @@ "dotenv-expand": "^5.1.0", "ee-first": "^1.1.1", "electron-to-chromium": "^1.4.365", - "elliptic": "^6.5.4", + "elliptic": "^6.6.0", "emoji-regex": "^8.0.0", "emojis-list": "^3.0.0", "encodeurl": "^1.0.2", @@ -4926,9 +4926,9 @@ "integrity": "sha512-UdREXMXzLkREF4jA8t89FQjA8WHI6ssP38PMY4/4KhXFQbtImnghh4GkCgrtiZwLKUKVD2iTVXvDVQjfomEQuA==" }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz", + "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==", "dependencies": { "bn.js": "^4.11.9", "brorand": "^1.1.0", diff --git a/package.json b/package.json index e43bc143..396f27c5 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "dotenv-expand": "^5.1.0", "ee-first": "^1.1.1", "electron-to-chromium": "^1.4.365", - "elliptic": "^6.5.8", + "elliptic": "^6.6.0", "emoji-regex": "^8.0.0", "emojis-list": "^3.0.0", "encodeurl": "^1.0.2", From a090fc8ed32584d01e364899e1db36e387d2a4ee Mon Sep 17 00:00:00 2001 From: Hamza <82822984+Som-gif@users.noreply.github.com> Date: Wed, 30 Oct 2024 14:36:15 +0100 Subject: [PATCH 3/7] Update PhysicalServerController.php Erreur de saisie de la variable physicalserver [ligne 30] --- app/Http/Controllers/API/PhysicalServerController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/API/PhysicalServerController.php b/app/Http/Controllers/API/PhysicalServerController.php index e76b2fbf..8a43b459 100644 --- a/app/Http/Controllers/API/PhysicalServerController.php +++ b/app/Http/Controllers/API/PhysicalServerController.php @@ -27,7 +27,7 @@ public function store(StorePhysicalServerRequest $request) abort_if(Gate::denies('physical_server_create'), Response::HTTP_FORBIDDEN, '403 Forbidden'); $physicalserver = PhysicalServer::create($request->all()); - $physicalServer->applications()->sync($request->input('applications', [])); + $physicalserver->applications()->sync($request->input('applications', [])); // syncs // $physicalserver->roles()->sync($request->input('roles', [])); From e3c6269c740701a75053a56e3defdc025c93d4f8 Mon Sep 17 00:00:00 2001 From: "s.djellali" Date: Sun, 3 Nov 2024 12:37:03 +0100 Subject: [PATCH 4/7] Migration de l'index dans la branche gh-pages --- _helm_chart/{chart => }/.helmignore | 0 _helm_chart/{chart => }/Chart.lock | 0 _helm_chart/{chart => }/Chart.yaml | 0 _helm_chart/{chart => }/README.md | 0 _helm_chart/index/index.yaml | 27 ------------------- _helm_chart/{chart => }/templates/NOTES.txt | 0 .../{chart => }/templates/_helpers.tpl | 0 .../{chart => }/templates/deployment.yaml | 0 _helm_chart/{chart => }/templates/hpa.yaml | 0 .../{chart => }/templates/ingress.yaml | 0 _helm_chart/{chart => }/templates/secret.yaml | 0 .../{chart => }/templates/service.yaml | 0 .../{chart => }/templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 _helm_chart/{chart => }/values.yaml | 0 15 files changed, 27 deletions(-) rename _helm_chart/{chart => }/.helmignore (100%) rename _helm_chart/{chart => }/Chart.lock (100%) rename _helm_chart/{chart => }/Chart.yaml (100%) rename _helm_chart/{chart => }/README.md (100%) delete mode 100644 _helm_chart/index/index.yaml rename _helm_chart/{chart => }/templates/NOTES.txt (100%) rename _helm_chart/{chart => }/templates/_helpers.tpl (100%) rename _helm_chart/{chart => }/templates/deployment.yaml (100%) rename _helm_chart/{chart => }/templates/hpa.yaml (100%) rename _helm_chart/{chart => }/templates/ingress.yaml (100%) rename _helm_chart/{chart => }/templates/secret.yaml (100%) rename _helm_chart/{chart => }/templates/service.yaml (100%) rename _helm_chart/{chart => }/templates/serviceaccount.yaml (100%) rename _helm_chart/{chart => }/templates/tests/test-connection.yaml (100%) rename _helm_chart/{chart => }/values.yaml (100%) diff --git a/_helm_chart/chart/.helmignore b/_helm_chart/.helmignore similarity index 100% rename from _helm_chart/chart/.helmignore rename to _helm_chart/.helmignore diff --git a/_helm_chart/chart/Chart.lock b/_helm_chart/Chart.lock similarity index 100% rename from _helm_chart/chart/Chart.lock rename to _helm_chart/Chart.lock diff --git a/_helm_chart/chart/Chart.yaml b/_helm_chart/Chart.yaml similarity index 100% rename from _helm_chart/chart/Chart.yaml rename to _helm_chart/Chart.yaml diff --git a/_helm_chart/chart/README.md b/_helm_chart/README.md similarity index 100% rename from _helm_chart/chart/README.md rename to _helm_chart/README.md diff --git a/_helm_chart/index/index.yaml b/_helm_chart/index/index.yaml deleted file mode 100644 index ce1ecc93..00000000 --- a/_helm_chart/index/index.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: v1 -entries: - mercator: - - apiVersion: v2 - appVersion: 0.1.0 - created: "2024-10-21T23:07:28.6495447+02:00" - dependencies: - - condition: redis.enabled - name: redis - repository: oci://registry-1.docker.io/bitnamicharts - version: 20.x.x - - condition: postgresql.enabled - name: postgresql - repository: oci://registry-1.docker.io/bitnamicharts - version: 16.x.x - description: A Helm chart for running Mercator via Kubernetes - digest: c437dc49191df995bb3fb56e116605af2d0f2cd56e213b787ad40f2e3612a5f0 - home: https://github.com/dbarzin/mercator - maintainers: - - name: Mercator - url: https://github.com/dbarzin/mercator/chart - name: mercator - type: application - urls: - - https://github.com/siddjellali/mercator/tree/master/_helm_chart/index/mercator-0.1.0.tgz - version: 0.1.0 -generated: "2024-10-21T23:07:28.6420429+02:00" diff --git a/_helm_chart/chart/templates/NOTES.txt b/_helm_chart/templates/NOTES.txt similarity index 100% rename from _helm_chart/chart/templates/NOTES.txt rename to _helm_chart/templates/NOTES.txt diff --git a/_helm_chart/chart/templates/_helpers.tpl b/_helm_chart/templates/_helpers.tpl similarity index 100% rename from _helm_chart/chart/templates/_helpers.tpl rename to _helm_chart/templates/_helpers.tpl diff --git a/_helm_chart/chart/templates/deployment.yaml b/_helm_chart/templates/deployment.yaml similarity index 100% rename from _helm_chart/chart/templates/deployment.yaml rename to _helm_chart/templates/deployment.yaml diff --git a/_helm_chart/chart/templates/hpa.yaml b/_helm_chart/templates/hpa.yaml similarity index 100% rename from _helm_chart/chart/templates/hpa.yaml rename to _helm_chart/templates/hpa.yaml diff --git a/_helm_chart/chart/templates/ingress.yaml b/_helm_chart/templates/ingress.yaml similarity index 100% rename from _helm_chart/chart/templates/ingress.yaml rename to _helm_chart/templates/ingress.yaml diff --git a/_helm_chart/chart/templates/secret.yaml b/_helm_chart/templates/secret.yaml similarity index 100% rename from _helm_chart/chart/templates/secret.yaml rename to _helm_chart/templates/secret.yaml diff --git a/_helm_chart/chart/templates/service.yaml b/_helm_chart/templates/service.yaml similarity index 100% rename from _helm_chart/chart/templates/service.yaml rename to _helm_chart/templates/service.yaml diff --git a/_helm_chart/chart/templates/serviceaccount.yaml b/_helm_chart/templates/serviceaccount.yaml similarity index 100% rename from _helm_chart/chart/templates/serviceaccount.yaml rename to _helm_chart/templates/serviceaccount.yaml diff --git a/_helm_chart/chart/templates/tests/test-connection.yaml b/_helm_chart/templates/tests/test-connection.yaml similarity index 100% rename from _helm_chart/chart/templates/tests/test-connection.yaml rename to _helm_chart/templates/tests/test-connection.yaml diff --git a/_helm_chart/chart/values.yaml b/_helm_chart/values.yaml similarity index 100% rename from _helm_chart/chart/values.yaml rename to _helm_chart/values.yaml From 68d42cc494cf9571b2f5b07dae3a7542c78ce833 Mon Sep 17 00:00:00 2001 From: "s.djellali" Date: Sun, 3 Nov 2024 13:23:50 +0100 Subject: [PATCH 5/7] Suppression du dossier _helmchart Ajout du tag artifacthub dans le README EN et FR --- README.fr.md | 1 + README.md | 1 + _helm_chart/.helmignore | 23 -- _helm_chart/Chart.lock | 9 - _helm_chart/Chart.yaml | 36 --- _helm_chart/README.md | 123 ---------- _helm_chart/templates/NOTES.txt | 22 -- _helm_chart/templates/_helpers.tpl | 62 ----- _helm_chart/templates/deployment.yaml | 203 ---------------- _helm_chart/templates/hpa.yaml | 32 --- _helm_chart/templates/ingress.yaml | 61 ----- _helm_chart/templates/secret.yaml | 10 - _helm_chart/templates/service.yaml | 15 -- _helm_chart/templates/serviceaccount.yaml | 13 - .../templates/tests/test-connection.yaml | 15 -- _helm_chart/values.yaml | 222 ------------------ 16 files changed, 2 insertions(+), 846 deletions(-) delete mode 100644 _helm_chart/.helmignore delete mode 100644 _helm_chart/Chart.lock delete mode 100644 _helm_chart/Chart.yaml delete mode 100644 _helm_chart/README.md delete mode 100644 _helm_chart/templates/NOTES.txt delete mode 100644 _helm_chart/templates/_helpers.tpl delete mode 100644 _helm_chart/templates/deployment.yaml delete mode 100644 _helm_chart/templates/hpa.yaml delete mode 100644 _helm_chart/templates/ingress.yaml delete mode 100644 _helm_chart/templates/secret.yaml delete mode 100644 _helm_chart/templates/service.yaml delete mode 100644 _helm_chart/templates/serviceaccount.yaml delete mode 100644 _helm_chart/templates/tests/test-connection.yaml delete mode 100644 _helm_chart/values.yaml diff --git a/README.fr.md b/README.fr.md index 9d0cb980..8b23e3b0 100644 --- a/README.fr.md +++ b/README.fr.md @@ -4,6 +4,7 @@ ![License](https://img.shields.io/github/license/dbarzin/mercator.svg?style=flat-square) ![Contributors](https://img.shields.io/github/contributors/dbarzin/mercator.svg?style=flat-square) ![Stars](https://img.shields.io/github/stars/dbarzin/mercator?style=flat-square) +[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/mercator)](https://artifacthub.io/packages/search?repo=mercator) **Mercator** est une application web open-source puissante et polyvalente, conçue pour faciliter la cartographie des systèmes d'information, comme décrit dans le [Guide de cartographie du système d'information](https://cyber.gouv.fr/publications/cartographie-du-systeme-dinformation) de l'[ANSSI](https://cyber.gouv.fr/). Que vous soyez un opérateur d'importance vitale ou que vous participiez à la gouvernance informatique plus large, Mercator est un outil essentiel pour acquérir de la visibilité, du contrôle et assurer la résilience de vos systèmes d'information. diff --git a/README.md b/README.md index df47d4de..8e792737 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ ![License](https://img.shields.io/github/license/dbarzin/mercator.svg?style=flat-square) ![Contributors](https://img.shields.io/github/contributors/dbarzin/mercator.svg?style=flat-square) ![Stars](https://img.shields.io/github/stars/dbarzin/mercator?style=flat-square) +[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/mercator)](https://artifacthub.io/packages/search?repo=mercator) **Mercator** is a powerful and versatile open-source web application designed to facilitate the mapping of information systems, as outlined in the [Mapping The Information System Guide](https://cyber.gouv.fr/en/publications/mapping-information-system) by [ANSSI](https://cyber.gouv.fr/en/). Whether you're an operator of vital importance or part of a broader IT governance framework, Mercator is an essential tool for gaining visibility, control, and ensuring the resilience of your information systems. diff --git a/_helm_chart/.helmignore b/_helm_chart/.helmignore deleted file mode 100644 index 0e8a0eb3..00000000 --- a/_helm_chart/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/_helm_chart/Chart.lock b/_helm_chart/Chart.lock deleted file mode 100644 index 672b047d..00000000 --- a/_helm_chart/Chart.lock +++ /dev/null @@ -1,9 +0,0 @@ -dependencies: -- name: redis - repository: oci://registry-1.docker.io/bitnamicharts - version: 20.1.7 -- name: postgresql - repository: oci://registry-1.docker.io/bitnamicharts - version: 16.0.1 -digest: sha256:432a55311d15e571a708a4299fc288c4c78c3ca9bf891172021568bf6a20c7eb -generated: "2024-10-06T20:21:49.987133+02:00" diff --git a/_helm_chart/Chart.yaml b/_helm_chart/Chart.yaml deleted file mode 100644 index e86768c3..00000000 --- a/_helm_chart/Chart.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: v2 -name: mercator -description: A Helm chart for running Mercator via Kubernetes -home: https://github.com/dbarzin/mercator -maintainers: - - name: Mercator - url: https://github.com/dbarzin/mercator/chart -dependencies: - - condition: redis.enabled - name: redis - repository: oci://registry-1.docker.io/bitnamicharts - version: 20.x.x - - condition: postgresql.enabled - name: postgresql - repository: oci://registry-1.docker.io/bitnamicharts - version: 16.x.x -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "0.1.0" diff --git a/_helm_chart/README.md b/_helm_chart/README.md deleted file mode 100644 index bef0d12a..00000000 --- a/_helm_chart/README.md +++ /dev/null @@ -1,123 +0,0 @@ -# Mercator Helm Chart -## TL;DR - -```bash -helm install mercator . -``` - -## Introduction - -This chart bootstraps **Mercator** deployment on a [Kubernetes](https://kubernetes.io/) cluster using the [Helm](https://helm.sh/) package manager. - -## Prerequisites -- Kubernetes 1.23+ -- Helm 3.8.0+ - -## Persistence -The Mercator chart relies on the PostgreSQL chart persistence. This means that Mercator does not persist anything. - -## Parameters -This part provides an overview of all the configurable parameters used in the `values.yaml` file for deploying the Mercator application using a Helm chart. - -### Global parameters - -| Parameter | Description | Default Value | -|------------------------------------------------|------------------------------------------------------------------------------|----------------------------| -| **replicaCount** | Number of application replicas to deploy. | `1` | -| **image.repository** | Docker image repository for the Mercator application. | `ghcr.io/dbarzin/mercator` | -| **image.pullPolicy** | Specifies when to pull the Docker image (`Always`, `IfNotPresent`, `Never`). | `IfNotPresent` | -| **image.tag** | Tag of the Docker image. | `"latest"` | -| **imagePullSecrets** | Secrets to use for pulling private Docker images. | `[]` | -| **serviceAccount.create** | Specifies whether a service account should be created. | `true` | -| **serviceAccount.automount** | Automatically mount the ServiceAccount’s API credentials. | `true` | -| **serviceAccount.annotations** | Annotations to add to the service account. | `{}` | -| **serviceAccount.name** | Name of the service account to use or create. | `""` | -| **podAnnotations** | Annotations to add to the pod. | `{}` | -| **podLabels** | Labels to add to the pod. | `{}` | -| **podSecurityContext** | Security context for the pod. | `{}` | -| **securityContext** | Security context for the container, e.g., user permissions. | `{}` | -| **service.type** | Kubernetes service type (`ClusterIP`, `NodePort`, `LoadBalancer`). | `ClusterIP` | -| **service.port** | Port exposed by the service. | `80` | -| **ingress.enabled** | Enable or disable ingress resource creation. | `false` | -| **resources** | Resource limits and requests for the application. | `{}` | -| **livenessProbe.httpGet.path** | HTTP path for liveness probe. | `/` | -| **livenessProbe.httpGet.port** | Port for liveness probe. | `http` | -| **readinessProbe.httpGet.path** | HTTP path for readiness probe. | `/` | -| **readinessProbe.httpGet.port** | Port for readiness probe. | `http` | -| **autoscaling.enabled** | Enable or disable horizontal pod autoscaling. | `false` | -| **autoscaling.minReplicas** | Minimum number of replicas for autoscaling. | `1` | -| **autoscaling.maxReplicas** | Maximum number of replicas for autoscaling. | `100` | -| **autoscaling.targetCPUUtilizationPercentage** | Target CPU utilization for autoscaling. | `80` | -| **volumes** | Additional volumes for the deployment. | `[]` | -| **volumeMounts** | Additional volume mounts for the deployment. | `[]` | -| **nodeSelector** | Node selector for scheduling pods. | `{}` | -| **tolerations** | Tolerations for scheduling pods. | `[]` | -| **affinity** | Affinity rules for scheduling pods. | `{}` | - -### Mercator parameters - -| Parameter | Description | Default Value | -|--------------------------------------------|------------------------------------------------------------------------------|------------------------------| -| **debug** | Enable debug mode for the application. | `false` | -| **environment** | Environment to deploy (`development`, `production`). | `"development"` | -| **key** | Secret key for the application. | `""` | -| **reverse_proxy** | URL for the reverse proxy used by the application. | `"http://localhost"` | -| **use_demo_data** | Specify if demo data should be used (1 for true, 0 for false). | `1` | - -### Mercator LDAP parameters - -| Parameter | Description | Default Value | -|--------------------------------------------|------------------------------------------------------------------------------|------------------------------| -| **ldap.enabled** | Enable or disable LDAP integration. | `false` | -| **ldap.type** | Type of LDAP server (e.g., Active Directory). | `"AD"` | -| **ldap.host** | LDAP server host. | `"127.0.0.1"` | -| **ldap.username** | LDAP bind user credentials. | `"cn=user,dc=local,dc=com"` | -| **ldap.password** | Password for the LDAP bind user. | `"secret"` | -| **ldap.base_dn** | Base DN for LDAP queries. | `"dc=local,dc=com"` | -| **ldap.service.number** | LDAP service port number. | `"389"` | -| **ldap.scope** | Scope for LDAP queries. | `"ou=Accounting,dc=com"` | - -### Mercator SMTP parameters -| Parameter | Description | Default Value | -|--------------------------------------------|------------------------------------------------------------------------------|------------------------------| -| **smtp.host** | SMTP server host for sending emails. | `"smtp.mailtrap.io"` | -| **smtp.port** | SMTP server port. | `"25"` | -| **smtp.username** | SMTP username for authentication. | `""` | -| **smtp.password** | SMTP password for authentication. | `""` | - -### Mercator AWS parameters -| Parameter | Description | Default Value | -|--------------------------------------------|------------------------------------------------------------------------------|------------------------------| -| **aws.access_key_id** | AWS access key ID. | `""` | -| **aws.secret_access_key** | AWS secret access key. | `""` | -| **aws.default_region** | Default AWS region. | `"us-east-1"` | -| **aws.bucket** | AWS S3 bucket name. | `""` | - -### Mercator PUSHER parameters -| Parameter | Description | Default Value | -|--------------------------------------------|------------------------------------------------------------------------------|------------------------------| -| **pusher.app_id** | Pusher app ID. | `""` | -| **pusher.app_key** | Pusher app key. | `""` | -| **pusher.app_secret** | Pusher app secret. | `""` | - -### Mercator KEYCLOAK parameters -| Parameter | Description | Default Value | -|--------------------------------------------|------------------------------------------------------------------------------|------------------------------| -| **keycloak.enabled** | Enable or disable Keycloak integration. | `false` | -| **keycloak.client_id** | Keycloak client ID. | `""` | -| **keycloak.client_secret** | Keycloak client secret. | `""` | -| **keycloak.redirect_uri** | Redirect URI for Keycloak integration. | `""` | -| **keycloak.base_url** | Base URL of Keycloak server. | `""` | -| **keycloak.realm** | Keycloak realm name. | `""` | - -### Mercator database parameters - -| Parameter | Description | Default Value | -|--------------------------------------------|------------------------------------------------------------------------------|------------------------------| -| **secret.postgres.postgresPassword** | PostgreSQL password for the application. | `"2ù_-qeeYT21!8zA2~"` | -| **postgresql.enabled** | Enable or disable PostgreSQL deployment. | `true` | -| **postgresql.auth.username** | PostgreSQL username for authentication. | `"mercator_user"` | -| **postgresql.auth.database** | PostgreSQL database name. | `"mercator"` | -| **redis.enabled** | Enable or disable Redis deployment. | `true` | -| **redis.auth.enabled** | Enable or disable Redis authentication. | `true` | -| **redis.auth.password** | Password for Redis authentication. diff --git a/_helm_chart/templates/NOTES.txt b/_helm_chart/templates/NOTES.txt deleted file mode 100644 index b9719937..00000000 --- a/_helm_chart/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "chart.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch its status by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "chart.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "chart.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "chart.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/_helm_chart/templates/_helpers.tpl b/_helm_chart/templates/_helpers.tpl deleted file mode 100644 index 7ba5edc2..00000000 --- a/_helm_chart/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "chart.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "chart.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "chart.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "chart.labels" -}} -helm.sh/chart: {{ include "chart.chart" . }} -{{ include "chart.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "chart.selectorLabels" -}} -app.kubernetes.io/name: {{ include "chart.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "chart.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "chart.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/_helm_chart/templates/deployment.yaml b/_helm_chart/templates/deployment.yaml deleted file mode 100644 index 3e4a182a..00000000 --- a/_helm_chart/templates/deployment.yaml +++ /dev/null @@ -1,203 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "chart.fullname" . }} - labels: - {{- include "chart.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "chart.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "chart.labels" . | nindent 8 }} - {{- with .Values.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "chart.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - initContainers: - - name: check-db-ready - image: "bitnami/postgresql:17-debian-12" - command: [ 'sh', '-c', - 'until pg_isready -h {{ .Values.postgresql.fullnameOverride }} -p 5432 -d {{ .Values.postgresql.auth.database }} -U {{ .Values.postgresql.auth.username }} ; - do echo waiting for database; sleep 10; done;' ] - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.service.port }} - protocol: TCP - livenessProbe: - {{- toYaml .Values.livenessProbe | nindent 12 }} - readinessProbe: - {{- toYaml .Values.readinessProbe | nindent 12 }} - resources: - {{- toYaml .Values.resources | nindent 12 }} - env: - - name: NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: APP_NAME - value: {{ .Chart.Name | quote }} - - name: REDIS_HOST - value: {{ .Values.redis.fullnameOverride | quote }} - - name: REDIS_PASSWORD - value: "null" - - name: REDIS_PORT - value: "6379" - - name: DB_CONNECTION - value: "pgsql" - - name: DB_HOST - value: {{ .Values.postgresql.fullnameOverride | quote }} - - name: DB_PORT - value: "5432" - - name: DB_DATABASE - value: {{ .Values.postgresql.auth.database | quote }} - - name: DB_USERNAME - value: {{ .Values.postgresql.auth.username | quote }} - - name: DB_PASSWORD - value: {{ .Values.secret.postgres.password }} - - name: BROADCAST_DRIVER - value: "log" - - name: CACHE_DRIVER - value: "file" - - name: QUEUE_CONNECTION - value: "sync" - - name: SESSION_DRIVER - value: "file" - - name: SESSION_LIFETIME - value: "120" - - name: LOG_CHANNEL - value: "stack" - - name: MAIL_MAILER - value: "smtp" - - name: MAIL_HOST - value: {{ .Values.smtp.host | quote }} - - name: MAIL_PORT - value: {{ .Values.smtp.port | quote }} - - name: MAIL_USERNAME - value: {{ .Values.smtp.username | quote }} - - name: MAIL_PASSWORD - value: {{ .Values.smtp.password | quote }} - - name: MAIL_ENCRYPTION - value: {{ .Values.smtp.encryption | quote }} - - name: MAIL_FROM_ADDRESS - value: {{ .Values.smtp.from_address | quote }} - - name: MAIL_FROM_NAME - value: {{ .Chart.Name | quote }} - - name: AWS_ACCESS_KEY_ID - value: {{ .Values.aws.access_key_id | quote }} - - name: AWS_SECRET_ACCESS_KEY - value: {{ .Values.aws.secret_access_key | quote }} - - name: AWS_DEFAULT_REGION - value: {{ .Values.aws.default_region | quote }} - - name: AWS_BUCKET - value: {{ .Values.aws.bucket | quote }} - - name: PUSHER_APP_ID - value: {{ .Values.pusher.app_id | quote }} - - name: PUSHER_APP_KEY - value: {{ .Values.pusher.app_key | quote }} - - name: PUSHER_APP_SECRET - value: {{ .Values.pusher.app_secret | quote }} - - name: PUSHER_APP_CLUSTER - value: {{ .Values.pusher.app_cluster | quote }} - - name: MIX_PUSHER_APP_KEY - value: {{ .Values.pusher.app_key | quote }} - - name: MIX_PUSHER_APP_CLUSTER - value: {{ .Values.pusher.app_cluster | quote }} - {{- if .Values.keycloak.enabled }} - - name: KEYCLOAK - value: "enabled" - - name: KEYCLOAK_CLIENT_ID - value: {{ .Values.keycloak.client_id | quote }} - - name: KEYCLOAK_CLIENT_SECRET - value: {{ .Values.keycloak.client_secret | quote }} - - name: KEYCLOAK_REDIRECT_URI - value: {{ .Values.keycloak.redirect_uri | quote }} - - name: KEYCLOAK_BASE_URL - value: {{ .Values.keycloak.base_url | quote }} - - name: KEYCLOAK_REALM - value: {{ .Values.keycloak.realm | quote }} - {{- else }} - - name: KEYCLOAK - value: "disable" - {{- end }} - {{- if .Values.ldap.enabled }} - - name: LDAP_TYPE - value: {{ .Values.ldap.type | quote }} - - name: LDAP_LOGGING - value: {{ .Values.ldap.logging }} - - name: LDAP_CONNECTION - value: {{ .Values.ldap.connection | quote }} - - name: LDAP_HOST - value: {{ .Values.ldap.host | quote }} - - name: LDAP_USERNAME - value: {{ .Values.ldap.username | quote }} - - name: LDAP_PASSWORD - value: {{ .Values.ldap.password | quote }} - - name: LDAP_PORT - value: {{ .Values.ldap.service.number | quote }} - - name: LDAP_BASE_DN - value: {{ .Values.ldap.base_dn | quote }} - - name: LDAP_TIMEOUT - value: {{ .Values.ldap.timeout | quote }} - - name: LDAP_SSL - value: {{ .Values.ldap.service.ssl }} - - name: LDAP_TLS - value: {{ .Values.ldap.service.tls }} - - name: LDAP_SCOPE - value: {{ .Values.ldap.scope | quote }} - - name: LDAP_GROUPS - value: {{ .Values.ldap.groups | quote }} - {{- end }} - - name: APP_DEBUG - value: {{ .Values.debug | quote }} - - name: APP_ENV - value: {{ .Values.environment | quote }} - - name: APP_KEY - value: {{ .Values.key | quote }} - - name: APP_URL - value: {{ .Values.reverse_proxy | quote }} - - name: USE_DEMO_DATA - value: {{ .Values.use_demo_data | quote }} - - {{- with .Values.volumeMounts }} - volumeMounts: - {{- toYaml . | nindent 12 }} - {{- end }} - {{- with .Values.volumes }} - volumes: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/_helm_chart/templates/hpa.yaml b/_helm_chart/templates/hpa.yaml deleted file mode 100644 index a91f61bd..00000000 --- a/_helm_chart/templates/hpa.yaml +++ /dev/null @@ -1,32 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "chart.fullname" . }} - labels: - {{- include "chart.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "chart.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/_helm_chart/templates/ingress.yaml b/_helm_chart/templates/ingress.yaml deleted file mode 100644 index 63c1311c..00000000 --- a/_helm_chart/templates/ingress.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "chart.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - {{- include "chart.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/_helm_chart/templates/secret.yaml b/_helm_chart/templates/secret.yaml deleted file mode 100644 index f8a17256..00000000 --- a/_helm_chart/templates/secret.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "chart.fullname" . }}-postgresql - labels: - {{- include "chart.labels" . | nindent 4 }} -type: Opaque -data: - password: {{ .Values.secret.postgres.password | b64enc | quote }} - postgres-password: {{ .Values.secret.postgres.postgresPassword | b64enc | quote }} diff --git a/_helm_chart/templates/service.yaml b/_helm_chart/templates/service.yaml deleted file mode 100644 index dfc5b3a3..00000000 --- a/_helm_chart/templates/service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "chart.fullname" . }} - labels: - {{- include "chart.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - {{- include "chart.selectorLabels" . | nindent 4 }} diff --git a/_helm_chart/templates/serviceaccount.yaml b/_helm_chart/templates/serviceaccount.yaml deleted file mode 100644 index 1df93501..00000000 --- a/_helm_chart/templates/serviceaccount.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "chart.serviceAccountName" . }} - labels: - {{- include "chart.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -automountServiceAccountToken: {{ .Values.serviceAccount.automount }} -{{- end }} diff --git a/_helm_chart/templates/tests/test-connection.yaml b/_helm_chart/templates/tests/test-connection.yaml deleted file mode 100644 index 8dfed872..00000000 --- a/_helm_chart/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "chart.fullname" . }}-test-connection" - labels: - {{- include "chart.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "chart.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/_helm_chart/values.yaml b/_helm_chart/values.yaml deleted file mode 100644 index 1043d2e1..00000000 --- a/_helm_chart/values.yaml +++ /dev/null @@ -1,222 +0,0 @@ -# Default values for chart. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: ghcr.io/dbarzin/mercator - pullPolicy: IfNotPresent - # Overrides the image tag whose default is the chart appVersion. - tag: "latest" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # Automatically mount a ServiceAccount's API credentials? - automount: true - # Annotations to add to the service account - annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} -podLabels: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - # className: "" - # annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - # hosts: - # - host: chart-example.local - # paths: - # - path: / - # pathType: ImplementationSpecific - # tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -debug: false -environment: "development" -key: "" -reverse_proxy: "http://localhost" -use_demo_data: 1 - -ldap: - enabled: false - type: "AD" - logging: true - connection: "default" - host: "127.0.0.1" - username: "cn=user,dc=local,dc=com" - password: "secret" - base_dn: "dc=local,dc=com" - timeout: "5" - service: - number: "389" - ssl: false - tls: false - scope: "ou=Accounting,ou=Groups,dc=planetexpress,dc=com" - groups: "Delivering,Help Desk" - -smtp: - host: "smtp.mailtrap.io" - port: "25" - username: "" - password: "" - encryption: "" - from_address: "" - -aws: - access_key_id: "" - secret_access_key: "" - default_region: "us-east-1" - bucket: "" - -pusher: - app_id: "" - app_key: "" - app_secret: "" - app_cluster: "mt1" - -keycloak: - enabled: false - client_id: "" # Client Name (on Keycloak) - client_secret: "" # Client Secret - redirect_uri: "" # /login/keycloak/callback - base_url: "" # - realm: "" # Realm Name - -livenessProbe: - httpGet: - path: / - port: http -readinessProbe: - httpGet: - path: / - port: http - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -# Additional volumes on the output Deployment definition. -volumes: [] -# - name: foo -# secret: -# secretName: mysecret -# optional: false - -# Additional volumeMounts on the output Deployment definition. -volumeMounts: [] -# - name: foo -# mountPath: "/etc/foo" -# readOnly: true - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -secret: - postgres: - postgresPassword: "2ù_-qeeYT21!8zA2~" - password: "1ù_-qeeRH21!8zA1~" - - -postgresql: - fullnameOverride: "postgresql" - enabled: true - auth: - username: "mercator_user" - database: "mercator" - existingSecret: "mercator-postgresql" - architecture: standalone - primary: - ## PostgreSQL Primary resource requests and limits - ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ - ## @param postgresql.primary.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if primary.resources is set (primary.resources is recommended for production). - ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 - ## - resourcesPreset: "nano" - ## @param postgresql.primary.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads) - ## Example: - ## resources: - ## requests: - ## cpu: 2 - ## memory: 512Mi - ## limits: - ## cpu: 3 - ## memory: 1024Mi - ## - resources: {} - -redis: - fullnameOverride: "redis" - enabled: true - auth: - enabled: true - ## Redis® password (both master and slave). Defaults to a random 10-character alphanumeric string if not set and auth.enabled is true. - ## It should always be set using the password value or in the existingSecret to avoid issues - ## with Airflow. - ## The password value is ignored if existingSecret is set - password: "" - existingSecret: "" - architecture: standalone - master: - ## Redis® master resource requests and limits - ## ref: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ - ## @param redis.master.resourcesPreset Set container resources according to one common preset (allowed values: none, nano, small, medium, large, xlarge, 2xlarge). This is ignored if master.resources is set (master.resources is recommended for production). - ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15 - ## - resourcesPreset: "nano" - ## @param redis.master.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads) - ## Example: - ## resources: - ## requests: - ## cpu: 2 - ## memory: 512Mi - ## limits: - ## cpu: 3 - ## memory: 1024Mi - ## - resources: {} \ No newline at end of file From 9ab72b7501320dc668a62e55b9abc4ce6268d99b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:21:17 +0000 Subject: [PATCH 6/7] Bump symfony/http-foundation from 7.1.6 to 7.1.7 Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 7.1.6 to 7.1.7. - [Release notes](https://github.com/symfony/http-foundation/releases) - [Changelog](https://github.com/symfony/http-foundation/blob/7.1/CHANGELOG.md) - [Commits](https://github.com/symfony/http-foundation/compare/v7.1.6...v7.1.7) --- updated-dependencies: - dependency-name: symfony/http-foundation dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 2f67f204..485f910f 100644 --- a/composer.lock +++ b/composer.lock @@ -5750,16 +5750,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.1.6", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "3d7bbf071b25f802f7d55524d408bed414ea71e2" + "reference": "5183b61657807099d98f3367bcccb850238b17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3d7bbf071b25f802f7d55524d408bed414ea71e2", - "reference": "3d7bbf071b25f802f7d55524d408bed414ea71e2", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5183b61657807099d98f3367bcccb850238b17a9", + "reference": "5183b61657807099d98f3367bcccb850238b17a9", "shasum": "" }, "require": { @@ -5807,7 +5807,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.1.6" + "source": "https://github.com/symfony/http-foundation/tree/v7.1.7" }, "funding": [ { @@ -5823,7 +5823,7 @@ "type": "tidelift" } ], - "time": "2024-10-11T19:23:14+00:00" + "time": "2024-11-06T09:02:46+00:00" }, { "name": "symfony/http-kernel", @@ -10021,5 +10021,5 @@ "php": "^8.2" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 60b6a141ccc54490ba15a7f3e662ebee73582847 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 16:22:20 +0000 Subject: [PATCH 7/7] Bump symfony/process from 7.1.6 to 7.1.7 Bumps [symfony/process](https://github.com/symfony/process) from 7.1.6 to 7.1.7. - [Release notes](https://github.com/symfony/process/releases) - [Changelog](https://github.com/symfony/process/blob/7.1/CHANGELOG.md) - [Commits](https://github.com/symfony/process/compare/v7.1.6...v7.1.7) --- updated-dependencies: - dependency-name: symfony/process dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 2f67f204..21aed240 100644 --- a/composer.lock +++ b/composer.lock @@ -6741,16 +6741,16 @@ }, { "name": "symfony/process", - "version": "v7.1.6", + "version": "v7.1.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e" + "reference": "9b8a40b7289767aa7117e957573c2a535efe6585" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e", - "reference": "6aaa189ddb4ff6b5de8fa3210f2fb42c87b4d12e", + "url": "https://api.github.com/repos/symfony/process/zipball/9b8a40b7289767aa7117e957573c2a535efe6585", + "reference": "9b8a40b7289767aa7117e957573c2a535efe6585", "shasum": "" }, "require": { @@ -6782,7 +6782,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.6" + "source": "https://github.com/symfony/process/tree/v7.1.7" }, "funding": [ { @@ -6798,7 +6798,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-11-06T09:25:12+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -10021,5 +10021,5 @@ "php": "^8.2" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" }