[topology-discovery] curls are performed using custom utilities image (…

…#413)
FRINXio · Aug 16, 2024 · fbde479 · fbde479
1 parent 915600e
commit fbde479
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/charts/topology-discovery/Chart.yaml b/charts/topology-discovery/Chart.yaml
@@ -3,19 +3,14 @@ name: topology-discovery
 description: A Helm chart for Kubernetes deployment of the Topology Discovery
 icon: https://avatars.githubusercontent.com/u/23452093?s=200&v=4
 type: application
-version: 3.1.0
+version: 3.1.1
 appVersion: "6.2.5"
 maintainers:
   - name: FRINX
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: Bump application version to 6.2.5
+      description: curls are performed using custom utilities image
       links:
         - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/388
-    - kind: added
-      description: Added kafka consumer api container
-      links:
-        - name: GitHub PR
-          url: https://github.com/FRINXio/helm-charts/pull/388
+          url: https://github.com/FRINXio/helm-charts/pull/413
diff --git a/charts/topology-discovery/README.md b/charts/topology-discovery/README.md
@@ -2,7 +2,7 @@
 
 A Helm chart for Kubernetes deployment of the Topology Discovery
 
-![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.5](https://img.shields.io/badge/AppVersion-6.2.5-informational?style=flat-square)
+![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.5](https://img.shields.io/badge/AppVersion-6.2.5-informational?style=flat-square)
 
 ## Get Repo Info
 
@@ -67,4 +67,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/topology-discovery/templates/deployment.yaml b/charts/topology-discovery/templates/deployment.yaml
@@ -33,14 +33,16 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       initContainers:
         - name: check-conductor-ready
-          image: curlimages/curl
+          image: "{{ .Values.utilitiesImage.repository }}:{{ .Values.utilitiesImage.tag }}"
+          imagePullPolicy: "{{ .Values.utilitiesImage.pullPolicy }}"
           command: ["/bin/sh","-c"]
           args: ['while [ $(curl -o /dev/null --silent --write-out "%{http_code}" {{ .Values.env.CONDUCTOR_URL }}/health) -ne 200 ];
             do sleep 5; echo "waiting for conductor";
             done;
             echo "connection successful!"']
         - name: check-arangodb-ready
-          image: curlimages/curl
+          image: "{{ .Values.utilitiesImage.repository }}:{{ .Values.utilitiesImage.tag }}"
+          imagePullPolicy: "{{ .Values.utilitiesImage.pullPolicy }}"
           command: ["/bin/sh","-c"]
           env:
             - name: ARANGO_URL 
@@ -69,7 +71,8 @@ spec:
             echo "connection successful!"']
         {{- if .Values.env.IMPORT_DEVICE_INVENTORY_DATA }}
         - name: check-inventory-ready
-          image: curlimages/curl
+          image: "{{ .Values.utilitiesImage.repository }}:{{ .Values.utilitiesImage.tag }}"
+          imagePullPolicy: "{{ .Values.utilitiesImage.pullPolicy }}"
           command: ["/bin/sh","-c"]
           args: ['while [ $(curl -o /dev/null --silent --write-out "%{http_code}" inventory:8000/.well-known/apollo/server-health) -ne 200 ];
             do sleep 5; echo "waiting for inventory";

diff --git a/charts/topology-discovery/values.yaml b/charts/topology-discovery/values.yaml
@@ -152,3 +152,11 @@ env:
   TD_KAFKA__TOPICS__DEVICE_EVENTS_TOPIC: device-events
   TD_KAFKA__BOOTSTRAP_SERVERS: '["kafka:9092"]'
   TD_KAFKA__API_VERSION: '["0", "11", "5"]'
+
+utilitiesImage:
+  # -- utilities image repository
+  repository: frinx/utilities-alpine
+  # -- Overrides the image tag.
+  tag: "1.2"
+  # -- Image pull policy
+  pullPolicy: IfNotPresent