diff --git a/charts/infrahub/Chart.yaml b/charts/infrahub/Chart.yaml index b641aa5..63d290a 100644 --- a/charts/infrahub/Chart.yaml +++ b/charts/infrahub/Chart.yaml @@ -18,7 +18,7 @@ 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: 4.8.4 +version: 5.0.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. @@ -30,17 +30,13 @@ dependencies: version: "2025.03.0" repository: "https://helm.neo4j.com/neo4j/" condition: neo4j.enabled - - name: common - repository: "oci://registry-1.docker.io/bitnamicharts" - version: "2.23.0" - condition: redis.enabled,rabbitmq.enabled - name: redis - version: "19.5.2" - repository: "oci://registry-1.docker.io/bitnamicharts" + version: "1.2.1" + repository: "https://groundhog2k.github.io/helm-charts/" condition: redis.enabled - name: rabbitmq - version: "14.4.1" - repository: "oci://registry-1.docker.io/bitnamicharts" + version: "1.1.3" + repository: "https://groundhog2k.github.io/helm-charts/" condition: rabbitmq.enabled - name: nats version: "1.1.12" diff --git a/charts/infrahub/README.md b/charts/infrahub/README.md index 55b2c22..a67b443 100644 --- a/charts/infrahub/README.md +++ b/charts/infrahub/README.md @@ -55,12 +55,11 @@ The chart offers the ability to configure persistence for the database and other | Repository | Name | Version | |------------|------|---------| +| https://groundhog2k.github.io/helm-charts/ | rabbitmq | 1.1.3 | +| https://groundhog2k.github.io/helm-charts/ | redis | 1.2.1 | | https://helm.neo4j.com/neo4j/ | neo4j | 2025.03.0 | | https://nats-io.github.io/k8s/helm/charts/ | nats | 1.1.12 | | https://prefecthq.github.io/prefect-helm | prefect-server | 2025.7.31204438 | -| oci://registry-1.docker.io/bitnamicharts | common | 2.23.0 | -| oci://registry-1.docker.io/bitnamicharts | rabbitmq | 14.4.1 | -| oci://registry-1.docker.io/bitnamicharts | redis | 19.5.2 | ## Values @@ -136,7 +135,7 @@ The chart offers the ability to configure persistence for the database and other | neo4j.volumes.data.mode | string | `"volume"` | | | neo4j.volumes.data.volume.emptyDir | object | `{}` | | | prefect-server.enabled | bool | `true` | | -| prefect-server.global.prefect.image.prefectTag | string | `"1.4.2"` | | +| prefect-server.global.prefect.image.prefectTag | string | `"1.4.6"` | | | prefect-server.global.prefect.image.repository | string | `"registry.opsmill.io/opsmill/infrahub"` | | | prefect-server.postgresql.enabled | bool | `true` | | | prefect-server.postgresql.primary.persistence.enabled | bool | `false` | | @@ -155,21 +154,21 @@ The chart offers the ability to configure persistence for the database and other | prefect-server.server.env[0].value | string | `"/"` | | | prefect-server.server.podLabels.infrahub/service | string | `"task-manager"` | | | prefect-server.serviceAccount.create | bool | `false` | | -| rabbitmq.auth.password | string | `"infrahub"` | | -| rabbitmq.auth.username | string | `"infrahub"` | | +| rabbitmq.authentication.erlangCookie.value | string | `"opsmill-infrahub-opsmill"` | | +| rabbitmq.authentication.password.value | string | `"infrahub"` | | +| rabbitmq.authentication.user.value | string | `"infrahub"` | | | rabbitmq.enabled | bool | `true` | | -| rabbitmq.metrics.enabled | bool | `true` | | -| rabbitmq.nameOverride | string | `"message-queue"` | | -| rabbitmq.persistence.enabled | bool | `false` | | +| rabbitmq.livenessProbe.initialDelaySeconds | int | `10` | | +| rabbitmq.nameOverride | string | `"message-queue-v2"` | | | rabbitmq.podLabels.infrahub/service | string | `"message-queue"` | | -| rabbitmq.startupProbe.enabled | bool | `true` | | -| redis.architecture | string | `"standalone"` | | -| redis.auth.enabled | bool | `false` | | +| rabbitmq.prometheusPlugin.enabled | bool | `true` | | +| rabbitmq.readinessProbe.initialDelaySeconds | int | `10` | | | redis.enabled | bool | `true` | | -| redis.master.persistence.enabled | bool | `false` | | -| redis.master.podLabels.infrahub/service | string | `"cache"` | | -| redis.master.service.ports.redis | int | `6379` | | -| redis.nameOverride | string | `"cache"` | | +| redis.haMode.enabled | bool | `false` | | +| redis.nameOverride | string | `"cache-v2"` | | +| redis.podLabels.infrahub/service | string | `"cache"` | | +| redis.service.serverPort | int | `6379` | | +| redis.useDeploymentWhenNonHA | bool | `true` | | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/infrahub/templates/_env.tpl b/charts/infrahub/templates/_env.tpl index 4d6b2f9..bb12175 100644 --- a/charts/infrahub/templates/_env.tpl +++ b/charts/infrahub/templates/_env.tpl @@ -24,19 +24,19 @@ Define default env variables if required. {{- end }} {{- if not .Values.infrahubDemoData.env.INFRAHUB_BROKER_ADDRESS }} - name: INFRAHUB_BROKER_ADDRESS - value: "{{ include "common.names.fullname" .Subcharts.rabbitmq }}" + value: "{{ include "rabbitmq.fullname" .Subcharts.rabbitmq }}" {{- end }} {{- if not .Values.infrahubDemoData.env.INFRAHUB_BROKER_USERNAME }} - name: INFRAHUB_BROKER_USERNAME - value: {{ .Values.rabbitmq.auth.username | quote }} + value: {{ .Values.rabbitmq.authentication.user.value | quote }} {{- end }} {{- if not .Values.infrahubDemoData.env.INFRAHUB_CACHE_ADDRESS }} - name: INFRAHUB_CACHE_ADDRESS - value: "{{ include "common.names.fullname" .Subcharts.redis }}-master" + value: "{{ include "redis.fullname" .Subcharts.redis }}" {{- end }} {{- if not .Values.infrahubDemoData.env.INFRAHUB_CACHE_PORT }} - name: INFRAHUB_CACHE_PORT - value: "{{ .Values.redis.master.service.ports.redis }}" + value: "{{ .Values.redis.service.serverPort }}" {{- end }} {{- end }} @@ -63,19 +63,19 @@ Define default env variables if required. {{- end }} {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_BROKER_ADDRESS }} - name: INFRAHUB_BROKER_ADDRESS - value: "{{ include "common.names.fullname" .Subcharts.rabbitmq }}" + value: "{{ include "rabbitmq.fullname" .Subcharts.rabbitmq }}" {{- end }} {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_BROKER_USERNAME }} - name: INFRAHUB_BROKER_USERNAME - value: {{ .Values.rabbitmq.auth.username | quote }} + value: {{ .Values.rabbitmq.authentication.user.value | quote }} {{- end }} {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_CACHE_ADDRESS }} - name: INFRAHUB_CACHE_ADDRESS - value: "{{ include "common.names.fullname" .Subcharts.redis }}-master" + value: "{{ include "redis.fullname" .Subcharts.redis }}" {{- end }} {{- if not .Values.infrahubServer.infrahubServer.env.INFRAHUB_CACHE_PORT }} - name: INFRAHUB_CACHE_PORT - value: "{{ .Values.redis.master.service.ports.redis }}" + value: "{{ .Values.redis.service.serverPort }}" {{- end }} {{- end }} @@ -102,19 +102,19 @@ Define default env variables if required. {{- end }} {{- if not .Values.infrahubTaskWorker.infrahubTaskWorker.env.INFRAHUB_BROKER_ADDRESS }} - name: INFRAHUB_BROKER_ADDRESS - value: "{{ include "common.names.fullname" .Subcharts.rabbitmq }}" + value: "{{ include "rabbitmq.fullname" .Subcharts.rabbitmq }}" {{- end }} {{- if not .Values.infrahubTaskWorker.infrahubTaskWorker.env.INFRAHUB_BROKER_USERNAME }} - name: INFRAHUB_BROKER_USERNAME - value: {{ .Values.rabbitmq.auth.username | quote }} + value: {{ .Values.rabbitmq.authentication.user.value | quote }} {{- end }} {{- if not .Values.infrahubTaskWorker.infrahubTaskWorker.env.INFRAHUB_CACHE_ADDRESS }} - name: INFRAHUB_CACHE_ADDRESS - value: "{{ include "common.names.fullname" .Subcharts.redis }}-master" + value: "{{ include "redis.fullname" .Subcharts.redis }}" {{- end }} {{- if not .Values.infrahubTaskWorker.infrahubTaskWorker.env.INFRAHUB_CACHE_PORT }} - name: INFRAHUB_CACHE_PORT - value: "{{ .Values.redis.master.service.ports.redis }}" + value: "{{ .Values.redis.service.serverPort }}" {{- end }} {{- end }} diff --git a/charts/infrahub/values.yaml b/charts/infrahub/values.yaml index d40c4ae..5582549 100644 --- a/charts/infrahub/values.yaml +++ b/charts/infrahub/values.yaml @@ -18,18 +18,14 @@ global: # ----------- Cache ----------- redis: enabled: true - nameOverride: cache - architecture: standalone - auth: + nameOverride: cache-v2 + haMode: enabled: false - master: - podLabels: - infrahub/service: cache - persistence: - enabled: false - service: - ports: - redis: 6379 + podLabels: + infrahub/service: cache + useDeploymentWhenNonHA: true + service: + serverPort: 6379 # ----------- Database ----------- neo4j: @@ -206,16 +202,20 @@ rabbitmq: podLabels: infrahub/service: message-queue enabled: true - nameOverride: message-queue - persistence: - enabled: false - auth: - username: infrahub - password: infrahub - metrics: - enabled: true - startupProbe: + nameOverride: message-queue-v2 + authentication: + user: + value: infrahub + password: + value: infrahub + erlangCookie: + value: opsmill-infrahub-opsmill + prometheusPlugin: enabled: true + livenessProbe: + initialDelaySeconds: 10 + readinessProbe: + initialDelaySeconds: 10 # ----------- NATS Server ----------- nats: