| commit | 7e601f5427ae014170c2705dc78bd91e0808c46f | [log] [tgz] |
|---|---|---|
| author | Krzysztof Opasiak <k.opasiak@samsung.com> | Tue May 19 23:50:11 2020 +0200 |
| committer | Krzysztof Opasiak <k.opasiak@samsung.com> | Tue May 26 16:09:33 2020 +0000 |
| tree | 979ecfe27c8883fa023d49df768c091c42effe64 | |
| parent | df31a724d919b39183df702f970ba4968c09d44e [diff] |
[CONTRIB] Use proper image for netbox provision job netbox was using readiness image to run its job. This is not the proper usage of this image and recently it started failing because bash is no longer available in this image. As the script does not containt bash-specific construcitons let's change the image to curl one and just use whatever shell is there. Issue-ID: OOM-2406 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com> Change-Id: I0cc99c6d8fe0dbe59ee982d255753d149fcdd3eb
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh index 5db036f..984801d 100755 --- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh +++ b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
@@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Create region
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml index f400277..7586a6c 100644 --- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml +++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml
@@ -48,12 +48,12 @@ fieldPath: metadata.namespace containers: - name: {{ include "common.name" . }}-provisioning-job - image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + image: "{{ .Values.global.dockerHubRepository }}/{{ .Values.global.curlImage }}" volumeMounts: - name: {{ include "common.fullname" . }}-provisioning mountPath: /tmp command: - - /bin/bash + - /bin/sh - ./tmp/provision.sh volumes: - name: {{ include "common.fullname" . }}-provisioning
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml index ddfdc4b..ff02e27 100755 --- a/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml +++ b/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml
@@ -42,6 +42,9 @@ superuserName: admin superuserEmail: admin@onap.org + curlImage: curlimages/curl:7.69.1 + dockerHubRepository: docker.io + repository: netboxcommunity image: netbox:v2.5.8