diff --git a/onos-e2t/Chart.yaml b/onos-e2t/Chart.yaml index 4bbdb625..fcbab78d 100644 --- a/onos-e2t/Chart.yaml +++ b/onos-e2t/Chart.yaml @@ -7,8 +7,8 @@ name: onos-e2t description: ONOS E2 Termination kubeVersion: ">=1.17.0" type: application -version: 1.3.6 -appVersion: v0.10.5 +version: 1.3.7 +appVersion: v0.10.6 keywords: - onos - sdn diff --git a/onos-e2t/values.yaml b/onos-e2t/values.yaml index 43da1cf7..81a4a544 100644 --- a/onos-e2t/values.yaml +++ b/onos-e2t/values.yaml @@ -48,29 +48,29 @@ store: storageSize: 1Gi servicemodels: - - name: e2sm_rc_pre + - name: e2sm_rc_pre_go version: 1.0.0 image: - repository: onosproject/service-model-docker-e2sm_rc_pre-1.0.0 - tag: v0.8.5 + repository: onosproject/service-model-docker-e2sm_rc_pre_go-1.0.0 + tag: v0.8.7 pullPolicy: IfNotPresent - - name: e2sm_kpm_v2 + - name: e2sm_kpm_v2_go version: 1.0.0 image: - repository: onosproject/service-model-docker-e2sm_kpm_v2-1.0.0 - tag: v0.8.5 + repository: onosproject/service-model-docker-e2sm_kpm_v2_go-1.0.0 + tag: v0.8.7 pullPolicy: IfNotPresent - name: e2sm_mho_go version: 1.0.0 image: repository: onosproject/service-model-docker-e2sm_mho_go-1.0.0 - tag: v0.8.5 + tag: v0.8.7 pullPolicy: IfNotPresent - name: e2sm_rsm version: 1.0.0 image: repository: onosproject/service-model-docker-e2sm_rsm-1.0.0 - tag: v0.8.5 + tag: v0.8.7 pullPolicy: IfNotPresent # - name: e2sm_ni # version: 1.0.0 diff --git a/onos-kpimon/Chart.yaml b/onos-kpimon/Chart.yaml index 04b3d0de..92d1358f 100644 --- a/onos-kpimon/Chart.yaml +++ b/onos-kpimon/Chart.yaml @@ -7,8 +7,8 @@ name: onos-kpimon description: ONOS KPIMON xAPP kubeVersion: ">=1.17.0" type: application -version: 0.8.2 -appVersion: v0.3.2 +version: 0.8.3 +appVersion: v0.3.3 keywords: - onos - sdn diff --git a/onos-kpimon/templates/_helpers.tpl b/onos-kpimon/templates/_helpers.tpl index 5f485bce..9b0290ec 100644 --- a/onos-kpimon/templates/_helpers.tpl +++ b/onos-kpimon/templates/_helpers.tpl @@ -64,6 +64,6 @@ onos-kpimon image name {{- if .Values.global.image.tag -}} {{- .Values.global.image.tag -}} {{- else -}} -{{- .Values.image.tag -}} +{{- tpl .Values.image.tag . -}} {{- end -}} {{- end -}} diff --git a/onos-kpimon/values.yaml b/onos-kpimon/values.yaml index 7d787df9..79348fb6 100644 --- a/onos-kpimon/values.yaml +++ b/onos-kpimon/values.yaml @@ -16,7 +16,7 @@ replicaCount: 1 image: registry: "" repository: onosproject/onos-kpimon - tag: v0.3.2 + tag: '{{ .Chart.AppVersion }}' pullPolicy: IfNotPresent pullSecrets: [] diff --git a/onos-pci/Chart.yaml b/onos-pci/Chart.yaml index 47142421..3258c37b 100644 --- a/onos-pci/Chart.yaml +++ b/onos-pci/Chart.yaml @@ -7,8 +7,8 @@ name: onos-pci description: ONOS PCI xAPP kubeVersion: ">=1.17.0" type: application -version: 0.8.2 -appVersion: v0.3.1 +version: 0.8.3 +appVersion: v0.3.3 keywords: - onos - sdn diff --git a/onos-pci/templates/_helpers.tpl b/onos-pci/templates/_helpers.tpl index ecb5ea85..015c411f 100644 --- a/onos-pci/templates/_helpers.tpl +++ b/onos-pci/templates/_helpers.tpl @@ -64,6 +64,6 @@ onos-pci image name {{- if .Values.global.image.tag -}} {{- .Values.global.image.tag -}} {{- else -}} -{{- .Values.image.tag -}} +{{- tpl .Values.image.tag . -}} {{- end -}} {{- end -}} diff --git a/onos-pci/values.yaml b/onos-pci/values.yaml index 2b2ca380..cc6fccd7 100644 --- a/onos-pci/values.yaml +++ b/onos-pci/values.yaml @@ -16,7 +16,7 @@ replicaCount: 1 image: registry: "" repository: onosproject/onos-pci - tag: v0.3.1 + tag: '{{ .Chart.AppVersion }}' pullPolicy: IfNotPresent pullSecrets: [] diff --git a/ran-simulator/Chart.yaml b/ran-simulator/Chart.yaml index f7c7adb9..303020fb 100644 --- a/ran-simulator/Chart.yaml +++ b/ran-simulator/Chart.yaml @@ -7,8 +7,8 @@ name: ran-simulator description: ONOS RAN Simulator kubeVersion: ">=1.15.0" type: application -version: 1.3.7 -appVersion: v0.9.2 +version: 1.3.8 +appVersion: v0.9.3 keywords: - onos - sdn diff --git a/ran-simulator/templates/_helpers.tpl b/ran-simulator/templates/_helpers.tpl index 7d6de9e9..c8b043a6 100644 --- a/ran-simulator/templates/_helpers.tpl +++ b/ran-simulator/templates/_helpers.tpl @@ -64,7 +64,7 @@ ran-simulator image name {{- if .Values.global.image.tag -}} {{- .Values.global.image.tag -}} {{- else -}} -{{- .Values.image.tag -}} +{{- tpl .Values.image.tag . -}} {{- end -}} {{- end -}} diff --git a/ran-simulator/values.yaml b/ran-simulator/values.yaml index 87cc7a44..070f216f 100644 --- a/ran-simulator/values.yaml +++ b/ran-simulator/values.yaml @@ -16,7 +16,7 @@ replicaCount: 1 image: registry: "" repository: onosproject/ran-simulator - tag: v0.9.2 + tag: '{{ .Chart.AppVersion }}' pullPolicy: IfNotPresent pullSecrets: [] diff --git a/sd-ran/Chart.yaml b/sd-ran/Chart.yaml index cf6941ab..469ba994 100644 --- a/sd-ran/Chart.yaml +++ b/sd-ran/Chart.yaml @@ -7,7 +7,7 @@ name: sd-ran description: Umbrella chart to deploy all ONOS-RIC and simulator kubeVersion: ">=1.17.0" type: application -version: 1.3.223 +version: 1.3.224 appVersion: v1.3.0 keywords: - onos @@ -25,7 +25,7 @@ dependencies: - name: onos-e2t condition: import.onos-e2t.enabled repository: file://../onos-e2t - version: 1.3.6 + version: 1.3.7 - name: onos-a1t condition: import.onos-a1t.enabled repository: file://../onos-a1t @@ -53,7 +53,7 @@ dependencies: - name: ran-simulator condition: import.ran-simulator.enabled repository: file://../ran-simulator - version: 1.3.7 + version: 1.3.8 - name: onos-cli condition: import.onos-cli.enabled repository: https://charts.onosproject.org @@ -61,11 +61,11 @@ dependencies: - name: onos-kpimon condition: import.onos-kpimon.enabled repository: file://../onos-kpimon - version: 0.8.2 + version: 0.8.3 - name: onos-pci condition: import.onos-pci.enabled repository: file://../onos-pci - version: 0.8.2 + version: 0.8.3 - name: fb-kpimon-xapp condition: import.fb-kpimon-xapp.enabled repository: file://../fb-kpimon-xapp diff --git a/sd-ran/values.yaml b/sd-ran/values.yaml index 6f3dab75..3bcbb3ad 100644 --- a/sd-ran/values.yaml +++ b/sd-ran/values.yaml @@ -142,29 +142,29 @@ onos-e2t: consensus: enabled: false servicemodels: - - name: e2sm_rc_pre + - name: e2sm_rc_pre_go version: 1.0.0 image: - repository: onosproject/service-model-docker-e2sm_rc_pre-1.0.0 - tag: v0.8.5 + repository: onosproject/service-model-docker-e2sm_rc_pre_go-1.0.0 + tag: v0.8.7 pullPolicy: IfNotPresent - - name: e2sm_kpm_v2 + - name: e2sm_kpm_v2_go version: 1.0.0 image: - repository: onosproject/service-model-docker-e2sm_kpm_v2-1.0.0 - tag: v0.8.5 + repository: onosproject/service-model-docker-e2sm_kpm_v2_go-1.0.0 + tag: v0.8.7 pullPolicy: IfNotPresent - name: e2sm_mho_go version: 1.0.0 image: repository: onosproject/service-model-docker-e2sm_mho_go-1.0.0 - tag: v0.8.5 + tag: v0.8.7 pullPolicy: IfNotPresent - name: e2sm_rsm version: 1.0.0 image: repository: onosproject/service-model-docker-e2sm_rsm-1.0.0 - tag: v0.8.5 + tag: v0.8.7 pullPolicy: IfNotPresent