diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-05-27 07:27:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-27 07:27:40 +0000 |
| commit | 622bf4cb9594bc3d0e44156dd5cb2b04cc89e658 (patch) | |
| tree | bde13281b92ce45c0cc6b848a34ab879d1aaf33b /kubernetes/contrib/components | |
| parent | dbab15fde615d85748f4664bf16376f5643453ac (diff) | |
| parent | 7e601f5427ae014170c2705dc78bd91e0808c46f (diff) | |
Merge "[CONTRIB] Use proper image for netbox provision job"
Diffstat (limited to 'kubernetes/contrib/components')
3 files changed, 6 insertions, 3 deletions
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 5db036f708..984801decb 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 f4002773fd..7586a6c95e 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 @@ spec: 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 ddfdc4b976..ff02e27b9b 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 @@ config: superuserName: admin superuserEmail: admin@onap.org + curlImage: curlimages/curl:7.69.1 + dockerHubRepository: docker.io + repository: netboxcommunity image: netbox:v2.5.8 |