summaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf/components/aaf-templates
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/aaf/components/aaf-templates')
-rw-r--r--kubernetes/aaf/components/aaf-templates/Chart.yaml2
-rw-r--r--kubernetes/aaf/components/aaf-templates/requirements.yaml2
-rw-r--r--kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl2
-rw-r--r--kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl8
4 files changed, 7 insertions, 7 deletions
diff --git a/kubernetes/aaf/components/aaf-templates/Chart.yaml b/kubernetes/aaf/components/aaf-templates/Chart.yaml
index c8739e0105..04e41e91ee 100644
--- a/kubernetes/aaf/components/aaf-templates/Chart.yaml
+++ b/kubernetes/aaf/components/aaf-templates/Chart.yaml
@@ -16,4 +16,4 @@
apiVersion: v1
description: ONAP Application Authorization Framework Templates
name: aaf-templates
-version: 6.0.0
+version: 7.0.0
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
index 6afaa06e8a..fc2e0ef0b3 100644
--- a/kubernetes/aaf/components/aaf-templates/requirements.yaml
+++ b/kubernetes/aaf/components/aaf-templates/requirements.yaml
@@ -14,5 +14,5 @@
dependencies:
- name: common
- version: ~6.x-0
+ version: ~7.x-0
repository: '@local'
diff --git a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
index bf6931a8e3..25a05a5e2f 100644
--- a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
+++ b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
@@ -28,7 +28,7 @@ spec:
- name: {{ include "common.name" . }}
workingDir: /opt/app/aaf
command: ["bin/{{ .Values.binary }}"]
- image: {{ include "common.repository" . }}/{{.Values.global.aaf.image}}
+ image: {{ include "repositoryGenerator.repository" . }}/{{.Values.global.aaf.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 10 }}
volumeMounts:
diff --git a/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl b/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
index 43c511fd6d..7cdf4d072e 100644
--- a/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
+++ b/kubernetes/aaf/components/aaf-templates/templates/_initContainers.tpl
@@ -23,7 +23,7 @@
- |
chown -R 1000:1000 /opt/app/aaf
chown -R 1000:1000 /opt/app/osaaf
- image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+ image: {{ include "repositoryGenerator.image.busybox" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- mountPath: /opt/app/osaaf
@@ -39,7 +39,7 @@
{{- define "aaf.podConfiguration" }}
- name: {{ include "common.name" . }}-config-container
- image: {{ .Values.global.repository }}/{{.Values.global.aaf.config.image}}
+ image: {{ include "repositoryGenerator.repository" . }}/{{.Values.global.aaf.config.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /bin/bash
@@ -96,7 +96,7 @@ initContainers:
{{- if .Values.sequence_order }}
- name: {{ include "common.name" . }}-aaf-readiness
command:
- - /root/ready.py
+ - /app/ready.py
args:
{{- range $container := .Values.sequence_order }}
- --container-name
@@ -108,7 +108,7 @@ initContainers:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
resources:
limits: