From 1655a262ffb97b694ce40cf209ed778064fe9cca Mon Sep 17 00:00:00 2001 From: smartin-elisapolystar Date: Thu, 15 Aug 2024 23:14:08 +0200 Subject: [PATCH] =?UTF-8?q?[resource-manager,=20preformance-monitor]=20db?= =?UTF-8?q?=5Fready=20checks=20are=20performed=20using=20custom=20utilitie?= =?UTF-8?q?s=E2=80=A6=20(#408)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charts/performance-monitor/Chart.yaml | 8 ++++---- charts/performance-monitor/README.md | 2 +- .../templates/tests/test-connection.yaml | 4 ++-- charts/resource-manager/Chart.yaml | 8 ++++---- charts/resource-manager/README.md | 14 +++++++------- charts/resource-manager/templates/deployment.yaml | 3 ++- .../templates/tests/test-connection.yaml | 3 ++- charts/resource-manager/values.yaml | 8 ++++++++ 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/charts/performance-monitor/Chart.yaml b/charts/performance-monitor/Chart.yaml index e8d1fc36..2d2a3b04 100644 --- a/charts/performance-monitor/Chart.yaml +++ b/charts/performance-monitor/Chart.yaml @@ -3,7 +3,7 @@ name: performance-monitor description: FRINX Performance Monitor chart for FRINX-machine icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4 type: application -version: 0.1.4 +version: 0.1.5 appVersion: "6.0.2" dependencies: - condition: postgresql.enabled @@ -23,8 +23,8 @@ annotations: - name: performance-monitor image: frinx/performance-monitor:6.0.2 artifacthub.io/changes: | - - kind: changed - description: Inventory db_ready checks are performed using custom utilities image + - kind: fixed + description: performance-monitor db_ready checks are performed using custom utilities image links: - name: GitHub PR - url: https://github.com/FRINXio/helm-charts/pull/407 + url: https://github.com/FRINXio/helm-charts/pull/408 diff --git a/charts/performance-monitor/README.md b/charts/performance-monitor/README.md index 124277dc..bb4a2aee 100644 --- a/charts/performance-monitor/README.md +++ b/charts/performance-monitor/README.md @@ -2,7 +2,7 @@ FRINX Performance Monitor chart for FRINX-machine -![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.2](https://img.shields.io/badge/AppVersion-6.0.2-informational?style=flat-square) +![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.2](https://img.shields.io/badge/AppVersion-6.0.2-informational?style=flat-square) ## Get Repo Info diff --git a/charts/performance-monitor/templates/tests/test-connection.yaml b/charts/performance-monitor/templates/tests/test-connection.yaml index 2635c79d..69f73cbb 100644 --- a/charts/performance-monitor/templates/tests/test-connection.yaml +++ b/charts/performance-monitor/templates/tests/test-connection.yaml @@ -11,6 +11,6 @@ spec: - name: wget image: "{{ .Values.utilitiesImage.repository }}:{{ .Values.utilitiesImage.tag }}" imagePullPolicy: "{{ .Values.utilitiesImage.pullPolicy }}" - command: ['wget'] - args: ['{{ include "performance-monitor.fullname" . }}:{{ .Values.service.port }}'] + command: ["/bin/sh"] + args: ["-c", 'wget {{ include "performance-monitor.fullname" . }}:{{ .Values.service.port }}'] restartPolicy: Never diff --git a/charts/resource-manager/Chart.yaml b/charts/resource-manager/Chart.yaml index 069cbf55..f8b021db 100644 --- a/charts/resource-manager/Chart.yaml +++ b/charts/resource-manager/Chart.yaml @@ -3,7 +3,7 @@ name: resource-manager description: A Helm chart for Kubernetes deploying of the Frinx Resource-Manager icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4 type: application -version: 2.2.0 +version: 2.2.1 appVersion: "6.1.0" maintainers: - name: FRINX @@ -16,8 +16,8 @@ dependencies: version: 14.x.x annotations: artifacthub.io/changes: | - - kind: added - description: Add metrics port for accessing metrics + - kind: changed + description: resource-manager db_ready checks are performed using custom utilities image links: - name: GitHub PR - url: https://github.com/FRINXio/helm-charts/pull/399 + url: https://github.com/FRINXio/helm-charts/pull/408 diff --git a/charts/resource-manager/README.md b/charts/resource-manager/README.md index 51eb8bfb..51d4fef8 100644 --- a/charts/resource-manager/README.md +++ b/charts/resource-manager/README.md @@ -2,7 +2,7 @@ A Helm chart for Kubernetes deploying of the Frinx Resource-Manager -![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.0](https://img.shields.io/badge/AppVersion-6.1.0-informational?style=flat-square) +![Version: 2.2.1](https://img.shields.io/badge/Version-2.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.1.0](https://img.shields.io/badge/AppVersion-6.1.0-informational?style=flat-square) ## Get Repo Info @@ -29,12 +29,6 @@ helm upgrade [RELEASE_NAME] frinx/resource-manager helm uninstall [RELEASE_NAME] ``` -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| FRINX | https://frinx.io | https://frinx.io | - ## Requirements | Repository | Name | Version | @@ -82,3 +76,9 @@ helm uninstall [RELEASE_NAME] | serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | serviceAccount.name | string | `""` | The name of the service account to use If not set and create is true, a name is generated using the fullname template | | tolerations | list | `[]` | [Tolerations for pod assignment](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | +| utilitiesImage.pullPolicy | string | `"IfNotPresent"` | Image pull policy | +| utilitiesImage.repository | string | `"frinx/utilities-alpine"` | utilities image repository | +| utilitiesImage.tag | string | `"1.2"` | Overrides the image tag. | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/charts/resource-manager/templates/deployment.yaml b/charts/resource-manager/templates/deployment.yaml index a60bddd3..570692e4 100644 --- a/charts/resource-manager/templates/deployment.yaml +++ b/charts/resource-manager/templates/deployment.yaml @@ -30,7 +30,8 @@ spec: restartPolicy: Always initContainers: - name: check-db-ready - image: postgres:alpine + image: "{{ .Values.utilitiesImage.repository }}:{{ .Values.utilitiesImage.tag }}" + imagePullPolicy: "{{ .Values.utilitiesImage.pullPolicy }}" env: - name: POSTGRES_USERNAME valueFrom: diff --git a/charts/resource-manager/templates/tests/test-connection.yaml b/charts/resource-manager/templates/tests/test-connection.yaml index f782890f..d5e42688 100644 --- a/charts/resource-manager/templates/tests/test-connection.yaml +++ b/charts/resource-manager/templates/tests/test-connection.yaml @@ -9,7 +9,8 @@ metadata: spec: containers: - name: wget - image: busybox + image: "{{ .Values.utilitiesImage.repository }}:{{ .Values.utilitiesImage.tag }}" + imagePullPolicy: "{{ .Values.utilitiesImage.pullPolicy }}" command: ["/bin/sh"] args: ["-c", 'wget {{ include "resource-manager.fullname" . }}:{{ .Values.service.port }}/healthz/readiness -P /tmp/'] restartPolicy: Never diff --git a/charts/resource-manager/values.yaml b/charts/resource-manager/values.yaml index ada1a968..35fe17ad 100644 --- a/charts/resource-manager/values.yaml +++ b/charts/resource-manager/values.yaml @@ -129,6 +129,14 @@ dbPersistence: POSTGRES_USERNAME: postgresU POSTGRES_PASSWORD: postgresP +utilitiesImage: + # -- utilities image repository + repository: frinx/utilities-alpine + # -- Overrides the image tag. + tag: "1.2" + # -- Image pull policy + pullPolicy: IfNotPresent + # -- Application environment variables env: RM_API_PORT: 8884