summaryrefslogtreecommitdiffstats
path: root/kubernetes/contrib/components
diff options
context:
space:
mode:
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-10-05 09:34:26 +0200
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>2020-10-05 09:49:57 +0200
commit2f098b0521818034944f26793046e960c238cf57 (patch)
treed91c3e6f68fd112c5dc218587c30b223df479010 /kubernetes/contrib/components
parent9b0a02ce435c5b8c486adaab3e03fc03f42914fb (diff)
[CONTRIB] Fix chart subcomponent's readiness image name pattern
This aims to fix the changes done in https://gerrit.onap.org/r/c/oom/+/111509 which broke ejbca/netbox/awx readiness image name pattern. Change-Id: I65d2f19a96d43c61167d63eb047e960dc213c985 Issue-ID: OOM-2584 Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
Diffstat (limited to 'kubernetes/contrib/components')
-rw-r--r--kubernetes/contrib/components/awx/charts/awx/templates/job.yaml4
-rw-r--r--kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml4
-rwxr-xr-xkubernetes/contrib/components/awx/values.yaml1
-rw-r--r--kubernetes/contrib/components/ejbca/values.yaml1
-rw-r--r--kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml2
-rwxr-xr-xkubernetes/contrib/components/netbox/values.yaml1
6 files changed, 8 insertions, 5 deletions
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml
index 4d80c9e448..74c02bcd5f 100644
--- a/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml
@@ -37,7 +37,7 @@ spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -122,4 +122,4 @@ spec:
name: {{ include "common.fullname" . }}-rabbitmq
name: rabbitmq-config
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml
index cfc517660a..6023bb4fdb 100644
--- a/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml
+++ b/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -210,4 +210,4 @@ spec:
name: {{ include "common.fullname" . }}-rabbitmq
name: rabbitmq-config
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key" \ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/contrib/components/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml
index bf862b6b63..1ed35c2c23 100755
--- a/kubernetes/contrib/components/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
@@ -16,6 +16,7 @@
# Global configuration defaults.
#################################################################
global:
+ readinessRepository: nexus3.onap.org:10001
nodePortPrefixExt: 304
commonConfigPrefix: awx
readinessImage: onap/oom/readiness:3.0.1
diff --git a/kubernetes/contrib/components/ejbca/values.yaml b/kubernetes/contrib/components/ejbca/values.yaml
index 060dcd98a7..1a9a34bcd1 100644
--- a/kubernetes/contrib/components/ejbca/values.yaml
+++ b/kubernetes/contrib/components/ejbca/values.yaml
@@ -37,6 +37,7 @@ secrets:
password: '{{ .Values.config.ejbca.clientIak }}'
# application configuration
+repository: nexus3.onap.org:10001
config:
db:
userName: ejbca
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 2c4e668699..a1b8cf1aae 100644
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml
+++ b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml
@@ -33,7 +33,7 @@ spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
diff --git a/kubernetes/contrib/components/netbox/values.yaml b/kubernetes/contrib/components/netbox/values.yaml
index 0749d2d948..5dc4535ca3 100755
--- a/kubernetes/contrib/components/netbox/values.yaml
+++ b/kubernetes/contrib/components/netbox/values.yaml
@@ -16,6 +16,7 @@
# Global configuration defaults.
#################################################################
global:
+ readinessRepository: nexus3.onap.org:10001
nodePortPrefixExt: 304
commonConfigPrefix: netbox
readinessImage: onap/oom/readiness:3.0.1