diff options
Diffstat (limited to 'kubernetes')
494 files changed, 1131 insertions, 1022 deletions
diff --git a/kubernetes/a1policymanagement/Chart.yaml b/kubernetes/a1policymanagement/Chart.yaml index ba51af4c6c..6ec0159c0e 100644 --- a/kubernetes/a1policymanagement/Chart.yaml +++ b/kubernetes/a1policymanagement/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 appVersion: "1.0.0" description: A Helm chart for A1 Policy Management Service name: a1policymanagement -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/a1policymanagement/requirements.yaml b/kubernetes/a1policymanagement/requirements.yaml index 7257fcf4f3..e570cb0b32 100644 --- a/kubernetes/a1policymanagement/requirements.yaml +++ b/kubernetes/a1policymanagement/requirements.yaml @@ -16,8 +16,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml index e44b49d7b5..e957774427 100644 --- a/kubernetes/aaf/Chart.yaml +++ b/kubernetes/aaf/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Application Authorization Framework name: aaf -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-cass/Chart.yaml b/kubernetes/aaf/components/aaf-cass/Chart.yaml index 42b4076689..62e0b5487d 100644 --- a/kubernetes/aaf/components/aaf-cass/Chart.yaml +++ b/kubernetes/aaf/components/aaf-cass/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP AAF cassandra name: aaf-cass -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-cass/requirements.yaml b/kubernetes/aaf/components/aaf-cass/requirements.yaml index 7a4543d57d..5e4dc93d39 100644 --- a/kubernetes/aaf/components/aaf-cass/requirements.yaml +++ b/kubernetes/aaf/components/aaf-cass/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/aaf/components/aaf-cm/Chart.yaml b/kubernetes/aaf/components/aaf-cm/Chart.yaml index ed453f7ac7..e674facdeb 100644 --- a/kubernetes/aaf/components/aaf-cm/Chart.yaml +++ b/kubernetes/aaf/components/aaf-cm/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP AAF Certificate Manager name: aaf-cm -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-cm/requirements.yaml b/kubernetes/aaf/components/aaf-cm/requirements.yaml index 004107e10f..85e9d72488 100644 --- a/kubernetes/aaf/components/aaf-cm/requirements.yaml +++ b/kubernetes/aaf/components/aaf-cm/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-fs/Chart.yaml b/kubernetes/aaf/components/aaf-fs/Chart.yaml index 211c4c28de..df15819aa9 100644 --- a/kubernetes/aaf/components/aaf-fs/Chart.yaml +++ b/kubernetes/aaf/components/aaf-fs/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP AAF File Server name: aaf-fs -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/aaf/components/aaf-fs/requirements.yaml b/kubernetes/aaf/components/aaf-fs/requirements.yaml index c7e2dcaa11..85e9d72488 100644 --- a/kubernetes/aaf/components/aaf-fs/requirements.yaml +++ b/kubernetes/aaf/components/aaf-fs/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-templates - version: ~6.x-0 - repository: 'file://../aaf-templates'
\ No newline at end of file + version: ~7.x-0 + repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-gui/Chart.yaml b/kubernetes/aaf/components/aaf-gui/Chart.yaml index 7e81a70759..2eb6c7e2e7 100644 --- a/kubernetes/aaf/components/aaf-gui/Chart.yaml +++ b/kubernetes/aaf/components/aaf-gui/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP AAF GUI name: aaf-gui -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/aaf/components/aaf-gui/requirements.yaml b/kubernetes/aaf/components/aaf-gui/requirements.yaml index 004107e10f..85e9d72488 100644 --- a/kubernetes/aaf/components/aaf-gui/requirements.yaml +++ b/kubernetes/aaf/components/aaf-gui/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml index 71b3242558..0b11b2f59d 100644 --- a/kubernetes/aaf/components/aaf-hello/Chart.yaml +++ b/kubernetes/aaf/components/aaf-hello/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP AAF Hello name: aaf-hello -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/aaf/components/aaf-hello/requirements.yaml b/kubernetes/aaf/components/aaf-hello/requirements.yaml index 004107e10f..85e9d72488 100644 --- a/kubernetes/aaf/components/aaf-hello/requirements.yaml +++ b/kubernetes/aaf/components/aaf-hello/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-locate/Chart.yaml b/kubernetes/aaf/components/aaf-locate/Chart.yaml index 3133191280..ab8443c4d2 100644 --- a/kubernetes/aaf/components/aaf-locate/Chart.yaml +++ b/kubernetes/aaf/components/aaf-locate/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP AAF Locate name: aaf-locate -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/aaf/components/aaf-locate/requirements.yaml b/kubernetes/aaf/components/aaf-locate/requirements.yaml index 004107e10f..85e9d72488 100644 --- a/kubernetes/aaf/components/aaf-locate/requirements.yaml +++ b/kubernetes/aaf/components/aaf-locate/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-oauth/Chart.yaml b/kubernetes/aaf/components/aaf-oauth/Chart.yaml index a64a17c7b1..ac76618c64 100644 --- a/kubernetes/aaf/components/aaf-oauth/Chart.yaml +++ b/kubernetes/aaf/components/aaf-oauth/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP AAF OAuth name: aaf-oauth -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/aaf/components/aaf-oauth/requirements.yaml b/kubernetes/aaf/components/aaf-oauth/requirements.yaml index 004107e10f..85e9d72488 100644 --- a/kubernetes/aaf/components/aaf-oauth/requirements.yaml +++ b/kubernetes/aaf/components/aaf-oauth/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-service/Chart.yaml b/kubernetes/aaf/components/aaf-service/Chart.yaml index 187e33ac6f..9bf1a88b04 100644 --- a/kubernetes/aaf/components/aaf-service/Chart.yaml +++ b/kubernetes/aaf/components/aaf-service/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP AAF Service name: aaf-service -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-service/requirements.yaml b/kubernetes/aaf/components/aaf-service/requirements.yaml index 004107e10f..85e9d72488 100644 --- a/kubernetes/aaf/components/aaf-service/requirements.yaml +++ b/kubernetes/aaf/components/aaf-service/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-sms/Chart.yaml b/kubernetes/aaf/components/aaf-sms/Chart.yaml index 557894f456..0d8cef7684 100644 --- a/kubernetes/aaf/components/aaf-sms/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sms/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Secret Management Service name: aaf-sms -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml index 2dc3d49b66..f06d82da2c 100644 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Secret Management Service Quorum Client name: aaf-sms-quorumclient -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml index 26bc7a64d8..f1f5e645c9 100644 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml +++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-quorumclient/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml index 074958ff70..19ece7bf69 100644 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: Chart to launch Vault as SMS backend name: aaf-sms-vault appVersion: 0.9.5 -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml index 26bc7a64d8..f1f5e645c9 100644 --- a/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml +++ b/kubernetes/aaf/components/aaf-sms/components/aaf-sms-vault/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/aaf/components/aaf-sms/requirements.yaml b/kubernetes/aaf/components/aaf-sms/requirements.yaml index a306ac63bf..95bdb6e69f 100644 --- a/kubernetes/aaf/components/aaf-sms/requirements.yaml +++ b/kubernetes/aaf/components/aaf-sms/requirements.yaml @@ -14,17 +14,17 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-sms-quorumclient - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-sms-quorumclient' - name: aaf-sms-vault - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-sms-vault' diff --git a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml index d39b561905..c35979954e 100644 --- a/kubernetes/aaf/components/aaf-sshsm/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Hardware Security Components name: aaf-sshsm -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml index 499b82caaf..d3b04fbed8 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Trusted Platform Module Resource Manager name: aaf-sshsm-abrmd -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml index 771a327656..4144bfa95d 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-abrmd/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml index 22ba3da019..1e881b5230 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Trusted Platform Module Distribution Center name: aaf-sshsm-distcenter -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml index 771a327656..4144bfa95d 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-distcenter/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml index b64e0c331a..ca82abb4b4 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Trusted Platform Module Test CA Service name: aaf-sshsm-testca -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml index 771a327656..4144bfa95d 100644 --- a/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/components/aaf-sshsm-testca/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml index bb76d59c04..831e0aff75 100644 --- a/kubernetes/aaf/components/aaf-sshsm/requirements.yaml +++ b/kubernetes/aaf/components/aaf-sshsm/requirements.yaml @@ -14,20 +14,20 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: aaf-sshsm-abrmd - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-sshsm-abrmd' condition: aaf-sshsm-abrmd.enabled - name: aaf-sshsm-distcenter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-sshsm-distcenter' condition: aaf-sshsm-distcenter.enabled - name: aaf-sshsm-testca - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-sshsm-testca' condition: aaf-sshsm-testca.testca.enabled 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/requirements.yaml b/kubernetes/aaf/requirements.yaml index 7a7103fc09..7b63a6d0ca 100644 --- a/kubernetes/aaf/requirements.yaml +++ b/kubernetes/aaf/requirements.yaml @@ -17,32 +17,32 @@ dependencies: - name: aaf-cass - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-cass' - name: aaf-cm - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-cm' - name: aaf-fs - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-fs' - name: aaf-gui - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-gui' - name: aaf-hello - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-hello' - name: aaf-locate - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-locate' - name: aaf-oauth - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-oauth' - name: aaf-service - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-service' - name: aaf-sms - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-sms' - name: aaf-sshsm - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/aaf-sshsm' diff --git a/kubernetes/aai b/kubernetes/aai -Subproject 540b846831e2053ccdcce9fa620cb7eeb7f5db4 +Subproject 18d4bd165e12cb4d03baa318e506f0dda381cd8 diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml index 3afa281194..e864c97276 100644 --- a/kubernetes/appc/Chart.yaml +++ b/kubernetes/appc/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: Application Controller name: appc -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/appc/components/appc-ansible-server/Chart.yaml b/kubernetes/appc/components/appc-ansible-server/Chart.yaml index 9c47c9eaef..5f09ca8b91 100644 --- a/kubernetes/appc/components/appc-ansible-server/Chart.yaml +++ b/kubernetes/appc/components/appc-ansible-server/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP APPC Ansible Server name: appc-ansible-server -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/appc/components/appc-ansible-server/requirements.yaml b/kubernetes/appc/components/appc-ansible-server/requirements.yaml index 2fa99a9484..af6016bdfb 100644 --- a/kubernetes/appc/components/appc-ansible-server/requirements.yaml +++ b/kubernetes/appc/components/appc-ansible-server/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/appc/components/appc-cdt/Chart.yaml b/kubernetes/appc/components/appc-cdt/Chart.yaml index 3d83bc945c..51668a9edf 100644 --- a/kubernetes/appc/components/appc-cdt/Chart.yaml +++ b/kubernetes/appc/components/appc-cdt/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP APPC Self Service Controller Design Tool name: appc-cdt -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/appc/components/appc-cdt/requirements.yaml b/kubernetes/appc/components/appc-cdt/requirements.yaml index fa92c63e34..5f5f1b145c 100644 --- a/kubernetes/appc/components/appc-cdt/requirements.yaml +++ b/kubernetes/appc/components/appc-cdt/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/appc/requirements.yaml b/kubernetes/appc/requirements.yaml index be72cc2b99..adb6a93cbd 100644 --- a/kubernetes/appc/requirements.yaml +++ b/kubernetes/appc/requirements.yaml @@ -14,22 +14,22 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: dgbuilder - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: appc-ansible-server - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/appc-ansible-server' condition: appc-ansible-server.enabled - name: appc-cdt - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/appc-cdt' condition: appc-cdt.enabled
\ No newline at end of file diff --git a/kubernetes/cds/Chart.yaml b/kubernetes/cds/Chart.yaml index 8fe6e92e41..ab34de4df7 100644 --- a/kubernetes/cds/Chart.yaml +++ b/kubernetes/cds/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Controller Design Studio (CDS) name: cds -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml index 64e3a952bc..1c5f0e022d 100755 --- a/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml +++ b/kubernetes/cds/components/cds-blueprints-processor/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP CDS Blueprints Processor name: cds-blueprints-processor -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml index b3805c7e41..84c8e721e4 100755 --- a/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml +++ b/kubernetes/cds/components/cds-blueprints-processor/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-command-executor/Chart.yaml b/kubernetes/cds/components/cds-command-executor/Chart.yaml index 62fb5629d7..f0d50581c4 100755 --- a/kubernetes/cds/components/cds-command-executor/Chart.yaml +++ b/kubernetes/cds/components/cds-command-executor/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP CDS Command Executor name: cds-command-executor -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-command-executor/requirements.yaml b/kubernetes/cds/components/cds-command-executor/requirements.yaml index 7a0e74bfaf..ff51b4420a 100755 --- a/kubernetes/cds/components/cds-command-executor/requirements.yaml +++ b/kubernetes/cds/components/cds-command-executor/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-py-executor/Chart.yaml b/kubernetes/cds/components/cds-py-executor/Chart.yaml index 41b43c34a3..d7e319a5a8 100755 --- a/kubernetes/cds/components/cds-py-executor/Chart.yaml +++ b/kubernetes/cds/components/cds-py-executor/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP CDS Py Executor name: cds-py-executor -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-py-executor/requirements.yaml b/kubernetes/cds/components/cds-py-executor/requirements.yaml index 722ecad6bf..1542f2089b 100755 --- a/kubernetes/cds/components/cds-py-executor/requirements.yaml +++ b/kubernetes/cds/components/cds-py-executor/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml index 975923ebbe..c2fa653457 100755 --- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml +++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP CDS SDC listener microservice name: cds-sdc-listener -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml index 7a0e74bfaf..ff51b4420a 100755 --- a/kubernetes/cds/components/cds-sdc-listener/requirements.yaml +++ b/kubernetes/cds/components/cds-sdc-listener/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-ui/Chart.yaml b/kubernetes/cds/components/cds-ui/Chart.yaml index 3ed3cf3717..ae14cb92af 100644 --- a/kubernetes/cds/components/cds-ui/Chart.yaml +++ b/kubernetes/cds/components/cds-ui/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP CDS UI name: cds-ui -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/cds/components/cds-ui/requirements.yaml b/kubernetes/cds/components/cds-ui/requirements.yaml index 7a0e74bfaf..ff51b4420a 100644 --- a/kubernetes/cds/components/cds-ui/requirements.yaml +++ b/kubernetes/cds/components/cds-ui/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml index 122e403727..214999b93a 100644 --- a/kubernetes/cds/requirements.yaml +++ b/kubernetes/cds/requirements.yaml @@ -15,28 +15,28 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: cds-blueprints-processor - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/cds-blueprints-processor' condition: cds-blueprints-processor.enabled - name: cds-blueprints-processor - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/cds-command-executor' condition: cds-command-executor.enabled - name: cds-py-executor - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/cds-py-executor' condition: cds-py-executor.enabled - name: cds-sdc-listener - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/cds-sdc-listener' condition: cds-sdc-listener.enabled - name: cds-ui - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/cds-ui' - condition: cds-ui.enabled
\ No newline at end of file + condition: cds-ui.enabled diff --git a/kubernetes/clamp/Chart.yaml b/kubernetes/clamp/Chart.yaml index 0f3f192331..e9f2197ea1 100644 --- a/kubernetes/clamp/Chart.yaml +++ b/kubernetes/clamp/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Clamp name: clamp -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/clamp/components/clamp-backend/Chart.yaml b/kubernetes/clamp/components/clamp-backend/Chart.yaml index 89117ce205..c9aa635ab5 100644 --- a/kubernetes/clamp/components/clamp-backend/Chart.yaml +++ b/kubernetes/clamp/components/clamp-backend/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Clamp name: clamp-backend -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/clamp/components/clamp-backend/requirements.yaml b/kubernetes/clamp/components/clamp-backend/requirements.yaml index 5b041a56f2..734166b43d 100644 --- a/kubernetes/clamp/components/clamp-backend/requirements.yaml +++ b/kubernetes/clamp/components/clamp-backend/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/clamp/components/clamp-dash-es/Chart.yaml b/kubernetes/clamp/components/clamp-dash-es/Chart.yaml index b2f8624a4b..c2b8ccb781 100644 --- a/kubernetes/clamp/components/clamp-dash-es/Chart.yaml +++ b/kubernetes/clamp/components/clamp-dash-es/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Clamp Dashboard Elasticsearch name: clamp-dash-es -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/clamp/components/clamp-dash-es/requirements.yaml b/kubernetes/clamp/components/clamp-dash-es/requirements.yaml index c388db3113..22b92c4ef7 100644 --- a/kubernetes/clamp/components/clamp-dash-es/requirements.yaml +++ b/kubernetes/clamp/components/clamp-dash-es/requirements.yaml @@ -15,11 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/clamp/components/clamp-dash-kibana/Chart.yaml b/kubernetes/clamp/components/clamp-dash-kibana/Chart.yaml index 5d897d96eb..f5c146a782 100644 --- a/kubernetes/clamp/components/clamp-dash-kibana/Chart.yaml +++ b/kubernetes/clamp/components/clamp-dash-kibana/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Clamp Dashboard Kibana name: clamp-dash-kibana -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml b/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml index c388db3113..22b92c4ef7 100644 --- a/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml +++ b/kubernetes/clamp/components/clamp-dash-kibana/requirements.yaml @@ -15,11 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/clamp/components/clamp-dash-logstash/Chart.yaml b/kubernetes/clamp/components/clamp-dash-logstash/Chart.yaml index 9fc0317fd3..686898eea2 100644 --- a/kubernetes/clamp/components/clamp-dash-logstash/Chart.yaml +++ b/kubernetes/clamp/components/clamp-dash-logstash/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Clamp Dashboard Logstash name: clamp-dash-logstash -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml b/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml index c388db3113..22b92c4ef7 100644 --- a/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml +++ b/kubernetes/clamp/components/clamp-dash-logstash/requirements.yaml @@ -15,11 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/clamp/components/clamp-mariadb/Chart.yaml b/kubernetes/clamp/components/clamp-mariadb/Chart.yaml index 91984c1014..c0de18592c 100644 --- a/kubernetes/clamp/components/clamp-mariadb/Chart.yaml +++ b/kubernetes/clamp/components/clamp-mariadb/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: MariaDB Service name: clamp-mariadb -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/clamp/components/clamp-mariadb/requirements.yaml b/kubernetes/clamp/components/clamp-mariadb/requirements.yaml index b5d66f3805..d62ef09a4d 100644 --- a/kubernetes/clamp/components/clamp-mariadb/requirements.yaml +++ b/kubernetes/clamp/components/clamp-mariadb/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/clamp/requirements.yaml b/kubernetes/clamp/requirements.yaml index fd71422f78..2d271032e9 100644 --- a/kubernetes/clamp/requirements.yaml +++ b/kubernetes/clamp/requirements.yaml @@ -15,23 +15,23 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: clamp-mariadb - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/clamp-mariadb' - name: clamp-backend - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/clamp-backend' - name: clamp-dash-es - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/clamp-dash-es' - name: clamp-dash-logstash - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/clamp-dash-logstash' - name: clamp-dash-kibana - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/clamp-dash-kibana'
\ No newline at end of file diff --git a/kubernetes/cli/Chart.yaml b/kubernetes/cli/Chart.yaml index 47421530be..8fa1d3c196 100644 --- a/kubernetes/cli/Chart.yaml +++ b/kubernetes/cli/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Command Line Interface name: cli -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/cli/requirements.yaml b/kubernetes/cli/requirements.yaml index e85005b9ae..f5931d50ed 100644 --- a/kubernetes/cli/requirements.yaml +++ b/kubernetes/cli/requirements.yaml @@ -14,7 +14,7 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) diff --git a/kubernetes/common/cassandra/Chart.yaml b/kubernetes/common/cassandra/Chart.yaml index 4eee3a0bde..704ea212bd 100644 --- a/kubernetes/common/cassandra/Chart.yaml +++ b/kubernetes/common/cassandra/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP cassandra name: cassandra -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/cassandra/requirements.yaml b/kubernetes/common/cassandra/requirements.yaml index 62e1158c12..cd708fc742 100644 --- a/kubernetes/common/cassandra/requirements.yaml +++ b/kubernetes/common/cassandra/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/cert-wrapper/Chart.yaml b/kubernetes/common/cert-wrapper/Chart.yaml index 68d5400743..5ef91a0a6c 100644 --- a/kubernetes/common/cert-wrapper/Chart.yaml +++ b/kubernetes/common/cert-wrapper/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Wrapper chart to allow truststore to be shared among cert-initializer instances name: cert-wrapper -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/cert-wrapper/requirements.yaml b/kubernetes/common/cert-wrapper/requirements.yaml index b6a667e448..34ac310004 100644 --- a/kubernetes/common/cert-wrapper/requirements.yaml +++ b/kubernetes/common/cert-wrapper/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../certInitializer' diff --git a/kubernetes/common/certInitializer/Chart.yaml b/kubernetes/common/certInitializer/Chart.yaml index 3b20045b1f..e933a02763 100644 --- a/kubernetes/common/certInitializer/Chart.yaml +++ b/kubernetes/common/certInitializer/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Template used to obtain certificates in onap name: certInitializer -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/certInitializer/requirements.yaml b/kubernetes/common/certInitializer/requirements.yaml index 31041ad669..81b0845ae0 100644 --- a/kubernetes/common/certInitializer/requirements.yaml +++ b/kubernetes/common/certInitializer/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../readinessCheck' diff --git a/kubernetes/common/cmpv2Config/Chart.yaml b/kubernetes/common/cmpv2Config/Chart.yaml index 816fcc79a5..35599551ba 100644 --- a/kubernetes/common/cmpv2Config/Chart.yaml +++ b/kubernetes/common/cmpv2Config/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Template used to store cmpv2 configuration in onap name: cmpv2Config -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/cmpv2Config/requirements.yaml b/kubernetes/common/cmpv2Config/requirements.yaml index c9c16a95ec..ac321e7cc3 100644 --- a/kubernetes/common/cmpv2Config/requirements.yaml +++ b/kubernetes/common/cmpv2Config/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' diff --git a/kubernetes/common/common/Chart.yaml b/kubernetes/common/common/Chart.yaml index 2d68fe93bb..567055bcb6 100644 --- a/kubernetes/common/common/Chart.yaml +++ b/kubernetes/common/common/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Common templates for inclusion in other charts name: common -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/common/documentation.rst b/kubernetes/common/common/documentation.rst index fd416c0cc8..52f7578601 100644 --- a/kubernetes/common/common/documentation.rst +++ b/kubernetes/common/common/documentation.rst @@ -435,7 +435,7 @@ would generate: namespace: default labels: app.kubernetes.io/name: nbi - helm.sh/chart: nbi-6.0.0 + helm.sh/chart: nbi-7.0.0 app.kubernetes.io/instance: release app.kubernetes.io/managed-by: Tiller spec: diff --git a/kubernetes/common/dgbuilder/Chart.yaml b/kubernetes/common/dgbuilder/Chart.yaml index 95677ac82b..624f19399d 100644 --- a/kubernetes/common/dgbuilder/Chart.yaml +++ b/kubernetes/common/dgbuilder/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: D.G. Builder application name: dgbuilder -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/common/dgbuilder/requirements.yaml b/kubernetes/common/dgbuilder/requirements.yaml index 8b7390802f..3a5558b67c 100644 --- a/kubernetes/common/dgbuilder/requirements.yaml +++ b/kubernetes/common/dgbuilder/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/elasticsearch/Chart.yaml b/kubernetes/common/elasticsearch/Chart.yaml index 517905641f..0839d9ff2f 100644 --- a/kubernetes/common/elasticsearch/Chart.yaml +++ b/kubernetes/common/elasticsearch/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP elasticsearch name: elasticsearch -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/elasticsearch/components/curator/Chart.yaml b/kubernetes/common/elasticsearch/components/curator/Chart.yaml index d1eaa61bc2..1b34db6c53 100644 --- a/kubernetes/common/elasticsearch/components/curator/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/curator/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP elasticsearch curator name: curator -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/elasticsearch/components/curator/requirements.yaml b/kubernetes/common/elasticsearch/components/curator/requirements.yaml index fbdf7b8489..43e8bbbbb6 100644 --- a/kubernetes/common/elasticsearch/components/curator/requirements.yaml +++ b/kubernetes/common/elasticsearch/components/curator/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/components/data/Chart.yaml b/kubernetes/common/elasticsearch/components/data/Chart.yaml index 5243a56101..3ae79a51b6 100644 --- a/kubernetes/common/elasticsearch/components/data/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/data/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP elasticsearch data name: data -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/elasticsearch/components/data/requirements.yaml b/kubernetes/common/elasticsearch/components/data/requirements.yaml index ba64f9630e..27cdebc8de 100644 --- a/kubernetes/common/elasticsearch/components/data/requirements.yaml +++ b/kubernetes/common/elasticsearch/components/data/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/components/master/Chart.yaml b/kubernetes/common/elasticsearch/components/master/Chart.yaml index e9ac99a5bc..6c26b61d1d 100644 --- a/kubernetes/common/elasticsearch/components/master/Chart.yaml +++ b/kubernetes/common/elasticsearch/components/master/Chart.yaml @@ -17,4 +17,4 @@ apiVersion: v1 description: ONAP elasticsearch master name: master -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/elasticsearch/components/master/requirements.yaml b/kubernetes/common/elasticsearch/components/master/requirements.yaml index ba64f9630e..27cdebc8de 100644 --- a/kubernetes/common/elasticsearch/components/master/requirements.yaml +++ b/kubernetes/common/elasticsearch/components/master/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../repositoryGenerator' diff --git a/kubernetes/common/elasticsearch/requirements.yaml b/kubernetes/common/elasticsearch/requirements.yaml index 4b7e88f51e..15379e40d7 100644 --- a/kubernetes/common/elasticsearch/requirements.yaml +++ b/kubernetes/common/elasticsearch/requirements.yaml @@ -14,22 +14,22 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: master - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/master' - name: data - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/data' condition: elasticsearch.data.enabled,data.enabled - name: curator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/curator' condition: elasticsearch.curator.enabled,curator.enabled - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../certInitializer' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/etcd/Chart.yaml b/kubernetes/common/etcd/Chart.yaml index edf91b8f47..dbd8203191 100644 --- a/kubernetes/common/etcd/Chart.yaml +++ b/kubernetes/common/etcd/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 name: etcd home: https://github.com/coreos/etcd -version: 6.0.0 +version: 7.0.0 appVersion: 2.2.5 description: Distributed reliable key-value store for the most critical data of a distributed system. diff --git a/kubernetes/common/etcd/requirements.yaml b/kubernetes/common/etcd/requirements.yaml index 733bc449cb..bf85c74071 100644 --- a/kubernetes/common/etcd/requirements.yaml +++ b/kubernetes/common/etcd/requirements.yaml @@ -14,8 +14,8 @@ # limitations under the License dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/logConfiguration/Chart.yaml b/kubernetes/common/logConfiguration/Chart.yaml index 1d13dcbd56..0b8c4f757f 100644 --- a/kubernetes/common/logConfiguration/Chart.yaml +++ b/kubernetes/common/logConfiguration/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Template used to create same STDOUT log configuration name: logConfiguration -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/logConfiguration/requirements.yaml b/kubernetes/common/logConfiguration/requirements.yaml index 237f1d1354..51e8789caf 100644 --- a/kubernetes/common/logConfiguration/requirements.yaml +++ b/kubernetes/common/logConfiguration/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' diff --git a/kubernetes/common/mariadb-galera/Chart.yaml b/kubernetes/common/mariadb-galera/Chart.yaml index 3b3de09091..0b4b3ba783 100644 --- a/kubernetes/common/mariadb-galera/Chart.yaml +++ b/kubernetes/common/mariadb-galera/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 description: Chart for MariaDB Galera cluster name: mariadb-galera -version: 6.0.0 +version: 7.0.0 keywords: - mariadb - mysql diff --git a/kubernetes/common/mariadb-galera/requirements.yaml b/kubernetes/common/mariadb-galera/requirements.yaml index 2509f7fcff..2397316010 100644 --- a/kubernetes/common/mariadb-galera/requirements.yaml +++ b/kubernetes/common/mariadb-galera/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/mariadb-init/Chart.yaml b/kubernetes/common/mariadb-init/Chart.yaml index 62a6f63a54..30cc3fc556 100644 --- a/kubernetes/common/mariadb-init/Chart.yaml +++ b/kubernetes/common/mariadb-init/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Chart for MariaDB Galera init job name: mariadb-init -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/mariadb-init/requirements.yaml b/kubernetes/common/mariadb-init/requirements.yaml index 2509f7fcff..2397316010 100644 --- a/kubernetes/common/mariadb-init/requirements.yaml +++ b/kubernetes/common/mariadb-init/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator'
\ No newline at end of file diff --git a/kubernetes/common/mongo/Chart.yaml b/kubernetes/common/mongo/Chart.yaml index e708efb12f..864185deb5 100644 --- a/kubernetes/common/mongo/Chart.yaml +++ b/kubernetes/common/mongo/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: MongoDB Server name: mongo -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/mongo/requirements.yaml b/kubernetes/common/mongo/requirements.yaml index 09c09d698b..56a9be6391 100644 --- a/kubernetes/common/mongo/requirements.yaml +++ b/kubernetes/common/mongo/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/music/Chart.yaml b/kubernetes/common/music/Chart.yaml index 381b536430..9e3eb23a8b 100644 --- a/kubernetes/common/music/Chart.yaml +++ b/kubernetes/common/music/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: MUSIC - Multi-site State Coordination Service name: music -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml index 301fb46756..b4feb7114b 100644 --- a/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml +++ b/kubernetes/common/music/charts/music-cassandra-job/Chart.yaml @@ -15,5 +15,5 @@ apiVersion: v1 description: Cassandra Job - Run CQL Scripts after Cassandra Starts. name: music-cassandra-job -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/music/charts/music-cassandra/Chart.yaml b/kubernetes/common/music/charts/music-cassandra/Chart.yaml index 7392b9879c..ed2488cc36 100644 --- a/kubernetes/common/music/charts/music-cassandra/Chart.yaml +++ b/kubernetes/common/music/charts/music-cassandra/Chart.yaml @@ -15,5 +15,5 @@ apiVersion: v1 description: ONAP - Cassandra Database name: music-cassandra -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/music/charts/music-cassandra/requirements.yaml b/kubernetes/common/music/charts/music-cassandra/requirements.yaml index 0a80d654d0..58fe07b90b 100644 --- a/kubernetes/common/music/charts/music-cassandra/requirements.yaml +++ b/kubernetes/common/music/charts/music-cassandra/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../common' diff --git a/kubernetes/common/music/charts/music/Chart.yaml b/kubernetes/common/music/charts/music/Chart.yaml index 7264b93e8a..105f447bd3 100644 --- a/kubernetes/common/music/charts/music/Chart.yaml +++ b/kubernetes/common/music/charts/music/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: MUSIC api as a Service API Spring boot container. name: music -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/music/requirements.yaml b/kubernetes/common/music/requirements.yaml index 1c428d214e..f16f6df288 100644 --- a/kubernetes/common/music/requirements.yaml +++ b/kubernetes/common/music/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' diff --git a/kubernetes/common/network-name-gen/Chart.yaml b/kubernetes/common/network-name-gen/Chart.yaml index 0725fcdb8f..4898658911 100644 --- a/kubernetes/common/network-name-gen/Chart.yaml +++ b/kubernetes/common/network-name-gen/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1
description: Name Generation Micro Service
name: network-name-gen
-version: 6.0.0
+version: 7.0.0
diff --git a/kubernetes/common/network-name-gen/requirements.yaml b/kubernetes/common/network-name-gen/requirements.yaml index 8c2277c210..cfd308c924 100644 --- a/kubernetes/common/network-name-gen/requirements.yaml +++ b/kubernetes/common/network-name-gen/requirements.yaml @@ -14,13 +14,16 @@ dependencies:
- name: common
- version: ~6.x-0
+ version: ~7.x-0
repository: 'file://../common'
+ - name: repositoryGenerator
+ version: ~7.x-0
+ repository: 'file://../repositoryGenerator'
- name: mariadb-galera
- version: ~6.x-0
+ version: ~7.x-0
repository: 'file://../mariadb-galera'
condition: global.mariadbGalera.localCluster
- name: mariadb-init
- version: ~6.x-0
+ version: ~7.x-0
repository: 'file://../mariadb-init'
condition: not global.mariadbGalera.localCluster
diff --git a/kubernetes/common/network-name-gen/templates/deployment.yaml b/kubernetes/common/network-name-gen/templates/deployment.yaml index c97c0488ac..16d93c6ed3 100644 --- a/kubernetes/common/network-name-gen/templates/deployment.yaml +++ b/kubernetes/common/network-name-gen/templates/deployment.yaml @@ -53,7 +53,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} containers: - name: {{ include "common.name" . }} @@ -62,7 +62,7 @@ spec: args: - '-c' - 'export POL_BASIC_AUTH=`echo -n $POL_BASIC_AUTH_USER:$POL_BASIC_AUTH_PASSWORD | base64`; /startService.sh' - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: SPRING_PROFILE diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index ade8a20df6..d38d6e25cd 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -21,13 +21,6 @@ global: # with other instances running within the same k8s cluster nodePortPrefix: 302 - # image repositories - repository: nexus3.onap.org:10001 - - - # readiness check - readinessImage: onap/oom/readiness:3.0.1 - # image pull policy pullPolicy: IfNotPresent @@ -77,7 +70,6 @@ mariadb-init: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/ccsdk-apps-ms-neng:1.0.2 pullPolicy: IfNotPresent diff --git a/kubernetes/common/postgres/Chart.yaml b/kubernetes/common/postgres/Chart.yaml index 8cba9c018f..d629e045a3 100644 --- a/kubernetes/common/postgres/Chart.yaml +++ b/kubernetes/common/postgres/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Postgres Server name: postgres -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/postgres/requirements.yaml b/kubernetes/common/postgres/requirements.yaml index 19a4513f52..2fdf57a7d9 100644 --- a/kubernetes/common/postgres/requirements.yaml +++ b/kubernetes/common/postgres/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml index 5aaad668f7..62f8e869da 100644 --- a/kubernetes/common/readinessCheck/Chart.yaml +++ b/kubernetes/common/readinessCheck/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Template used to wait for other deployment/sts/jobs in onap name: readinessCheck -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/readinessCheck/requirements.yaml b/kubernetes/common/readinessCheck/requirements.yaml index 237f1d1354..51e8789caf 100644 --- a/kubernetes/common/readinessCheck/requirements.yaml +++ b/kubernetes/common/readinessCheck/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' diff --git a/kubernetes/common/repository-wrapper/Chart.yaml b/kubernetes/common/repository-wrapper/Chart.yaml index 7f48d16877..a65867bad6 100644 --- a/kubernetes/common/repository-wrapper/Chart.yaml +++ b/kubernetes/common/repository-wrapper/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Wrapper chart to allow docker secret to be shared all instances name: repository-wrapper -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/repository-wrapper/requirements.yaml b/kubernetes/common/repository-wrapper/requirements.yaml index 02d40a57d9..9ef1615aae 100644 --- a/kubernetes/common/repository-wrapper/requirements.yaml +++ b/kubernetes/common/repository-wrapper/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../repositoryGenerator' diff --git a/kubernetes/common/repositoryGenerator/Chart.yaml b/kubernetes/common/repositoryGenerator/Chart.yaml index 5ff53fa3d4..3244b82158 100644 --- a/kubernetes/common/repositoryGenerator/Chart.yaml +++ b/kubernetes/common/repositoryGenerator/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Template used to generate the right repository link name: repositoryGenerator -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/serviceAccount/Chart.yaml b/kubernetes/common/serviceAccount/Chart.yaml index 9e838af3a7..bbabba2120 100644 --- a/kubernetes/common/serviceAccount/Chart.yaml +++ b/kubernetes/common/serviceAccount/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Template used to create the right Service Accounts / Role / RoleBinding name: serviceAccount -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/common/serviceAccount/requirements.yaml b/kubernetes/common/serviceAccount/requirements.yaml index 237f1d1354..51e8789caf 100644 --- a/kubernetes/common/serviceAccount/requirements.yaml +++ b/kubernetes/common/serviceAccount/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../common' diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml index b9a330af5a..88acea9548 100644 --- a/kubernetes/consul/Chart.yaml +++ b/kubernetes/consul/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Consul Agent name: consul -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/charts/consul-server/Chart.yaml index a50afa552c..8a94ed5b68 100644 --- a/kubernetes/consul/charts/consul-server/Chart.yaml +++ b/kubernetes/consul/charts/consul-server/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Consul Server name: consul-server -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/charts/consul-server/requirements.yaml index d3c442d32e..6963d207e7 100644 --- a/kubernetes/consul/charts/consul-server/requirements.yaml +++ b/kubernetes/consul/charts/consul-server/requirements.yaml @@ -15,7 +15,7 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml index 0b77abe706..2161e6e16e 100644 --- a/kubernetes/consul/requirements.yaml +++ b/kubernetes/consul/requirements.yaml @@ -15,11 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/contrib/Chart.yaml b/kubernetes/contrib/Chart.yaml index eaaf43bebe..3eca2e328f 100755 --- a/kubernetes/contrib/Chart.yaml +++ b/kubernetes/contrib/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP optional tools name: contrib -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml index 6cd16b4783..1b24368764 100755 --- a/kubernetes/contrib/components/awx/Chart.yaml +++ b/kubernetes/contrib/components/awx/Chart.yaml @@ -17,4 +17,4 @@ description: Ansible AWX name: awx sources: - https://github.com/ansible/awx -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml index e30faf275e..c68cf09c32 100755 --- a/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml +++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Ansible AWX database name: awx-postgres -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml index a93a429647..76a280bc3b 100755 --- a/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml +++ b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml index 5eda4dbe7e..60d7c30a1a 100755 --- a/kubernetes/contrib/components/awx/requirements.yaml +++ b/kubernetes/contrib/components/awx/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - - name: awx-postgres - version: ~6.x-0 + - name: awx-postgres + version: ~7.x-0 repository: 'file://components/awx-postgres' diff --git a/kubernetes/contrib/components/ejbca/Chart.yaml b/kubernetes/contrib/components/ejbca/Chart.yaml index 4de6930f0c..e359859609 100644 --- a/kubernetes/contrib/components/ejbca/Chart.yaml +++ b/kubernetes/contrib/components/ejbca/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP EJBCA test server name: ejbca -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml index 00542037af..6474557a83 100644 --- a/kubernetes/contrib/components/ejbca/requirements.yaml +++ b/kubernetes/contrib/components/ejbca/requirements.yaml @@ -13,16 +13,16 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: global.mariadbGalera.localCluster - name: mariadb-init - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: not global.mariadbGalera.localCluster - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/contrib/components/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml index 04f3144336..16cdd8981a 100755 --- a/kubernetes/contrib/components/netbox/Chart.yaml +++ b/kubernetes/contrib/components/netbox/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Netbox IPAM name: netbox -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml index 787bc4a971..689fbdeae4 100755 --- a/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml +++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Netbox - Application (WSGI + Gunicorn) name: netbox-app -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml index 9a0c10d687..d594ed1400 100755 --- a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml +++ b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml index 4abaa27365..cbaca16d78 100755 --- a/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml +++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Netbox - Nginx web server name: netbox-nginx -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml index 9a0c10d687..d594ed1400 100755 --- a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml +++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml index c439e1d580..ade6aa082f 100755 --- a/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml +++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Netbox Posgres database name: netbox-postgres -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml index 9a0c10d687..d594ed1400 100755 --- a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml +++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/contrib/components/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml index 29cf5e2770..b929a5cc1a 100755 --- a/kubernetes/contrib/components/netbox/requirements.yaml +++ b/kubernetes/contrib/components/netbox/requirements.yaml @@ -14,17 +14,17 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: netbox-app - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/netbox-app' - name: netbox-nginx - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/netbox-nginx' - name: netbox-postgres - version: ~6.x-0 - repository: 'file://components/netbox-postgres'
\ No newline at end of file + version: ~7.x-0 + repository: 'file://components/netbox-postgres' diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml index 7e60bfa991..7bbe596ae2 100644 --- a/kubernetes/contrib/requirements.yaml +++ b/kubernetes/contrib/requirements.yaml @@ -14,20 +14,20 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: awx - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/awx' condition: awx.enabled - name: ejbca - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/ejbca' condition: global.cmpv2Enabled - name: netbox - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/netbox' condition: netbox.enabled - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/Chart.yaml b/kubernetes/dcaegen2/Chart.yaml index 6dbd40679e..9e5ef7d22f 100644 --- a/kubernetes/dcaegen2/Chart.yaml +++ b/kubernetes/dcaegen2/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP DCAE Gen2 name: dcaegen2 -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml index 87b6a87ee2..903c4764aa 100644 --- a/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-bootstrap/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP DCAE Bootstrap name: dcae-bootstrap -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml index a31aaf1106..f0e9a39494 100644 --- a/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-bootstrap/requirements.yaml @@ -19,18 +19,18 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: postgres - version: ~6.x-0 + version: ~7.x-0 repository: '@local' alias: postgres - name: mongo - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: cmpv2Config - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml index 5a23621f2a..45d1d78f41 100644 --- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP DCAE Cloudify Manager name: dcae-cloudify-manager -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml index c2681fb217..af43e0fb71 100644 --- a/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-cloudify-manager/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml index 8d9a28a4b4..fe4fb35463 100644 --- a/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE Config Binding Service name: dcae-config-binding-service -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml index c2681fb217..af43e0fb71 100644 --- a/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-config-binding-service/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml index a46ea7ec52..a6bb7662bf 100644 --- a/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-dashboard/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: DCAE Dashboard name: dcae-dashboard -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml index cbc9a739c5..4de0887e31 100644 --- a/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-dashboard/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: postgres - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml index e918b7717c..ad7b628aba 100644 --- a/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE Deployment Handler name: dcae-deployment-handler -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml index 8ba2ea88d3..05a9d34399 100644 --- a/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml index 7c10b31b58..0b98bb9139 100644 --- a/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-healthcheck/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP DCAE Health Check name: dcae-healthcheck -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml index 45dddcfbd1..aadca0d9bf 100644 --- a/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-healthcheck/requirements.yaml @@ -18,8 +18,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml index face827504..81ad6f675a 100644 --- a/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-inventory-api/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE Inventory API Service name: dcae-inventory-api -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml index f841401e7f..181a820d1b 100644 --- a/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-inventory-api/requirements.yaml @@ -15,11 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: postgres - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml index dfcc52e116..aefbe49764 100644 --- a/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-policy-handler/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE Policy Handler name: dcae-policy-handler -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml index 8ba2ea88d3..05a9d34399 100644 --- a/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-policy-handler/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml index 3b96aca5b9..1d8a48daa2 100644 --- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml +++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE Service Change Handler name: dcae-servicechange-handler -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml +++ b/kubernetes/dcaegen2/components/dcae-servicechange-handler/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaegen2/requirements.yaml b/kubernetes/dcaegen2/requirements.yaml index 82629f7e21..bbdcb4815c 100644 --- a/kubernetes/dcaegen2/requirements.yaml +++ b/kubernetes/dcaegen2/requirements.yaml @@ -14,42 +14,42 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: dcae-bootstrap - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-bootstrap' condition: dcae-bootstrap.enabled - name: dcae-cloudify-manager - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-cloudify-manager' condition: dcae-cloudify-manager.enabled - name: dcae-config-binding-service - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-config-binding-service' condition: dcae-config-binding-service.enabled - name: dcae-healthcheck - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-healthcheck' condition: dcae-healthcheck.enabled - name: dcae-servicechange-handler - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-servicechange-handler' condition: dcae-servicechange-handler.enabled - name: dcae-inventory-api - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-inventory-api' condition: dcae-inventory-api.enabled - name: dcae-deployment-handler - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-deployment-handler' condition: dcae-deployment-handler.enabled - name: dcae-policy-handler - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-policy-handler' condition: dcae-policy-handler.enabled - name: dcae-dashboard - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcae-dashboard' condition: dcae-dashboard.enabled diff --git a/kubernetes/dcaemod/Chart.yaml b/kubernetes/dcaemod/Chart.yaml index 9fe96fb7e2..566f7a5e73 100644 --- a/kubernetes/dcaemod/Chart.yaml +++ b/kubernetes/dcaemod/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE MOD name: dcaemod -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml index eeda833f76..85bd97951c 100644 --- a/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml +++ b/kubernetes/dcaemod/components/dcaemod-designtool/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE MOD Design Tool name: dcaemod-designtool -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml index 627dc59e81..81c0101c73 100644 --- a/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-designtool/requirements.yaml @@ -17,8 +17,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml index e56e62f701..ef3377a12e 100644 --- a/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml +++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE MOD Distributor API name: dcaemod-distributor-api -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml index 51543cf310..b5ffe20512 100644 --- a/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/requirements.yaml @@ -17,8 +17,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml index 781c30e41a..3c49ee97c9 100644 --- a/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml +++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE MOD Genprocessor name: dcaemod-genprocessor -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml index 51543cf310..b5ffe20512 100644 --- a/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/requirements.yaml @@ -17,8 +17,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml index 00b0117115..a77d6395e3 100644 --- a/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml +++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP DCAE MOD Health Check name: dcaemod-healthcheck -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml index 45dddcfbd1..aadca0d9bf 100644 --- a/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-healthcheck/requirements.yaml @@ -18,8 +18,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml index 81a7a54967..13d7ad96e4 100644 --- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml +++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE MOD Nifi Registry name: dcaemod-nifi-registry -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml index 51543cf310..b5ffe20512 100644 --- a/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-nifi-registry/requirements.yaml @@ -17,8 +17,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml index defe9d9957..8a67ebda7a 100644 --- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml +++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE MOD Onboarding API name: dcaemod-onboarding-api -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml index 7e71a401ab..97217ba5cc 100644 --- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/requirements.yaml @@ -17,11 +17,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: postgres - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml index 0abc522e45..7acd9ad44b 100644 --- a/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: ONAP DCAE MOD Runtime API name: dcaemod-runtime-api -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml index f3a02ca58a..ed01649858 100644 --- a/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml +++ b/kubernetes/dcaemod/components/dcaemod-runtime-api/requirements.yaml @@ -17,9 +17,9 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dcaemod/requirements.yaml b/kubernetes/dcaemod/requirements.yaml index 98a563f535..0af43191b6 100644 --- a/kubernetes/dcaemod/requirements.yaml +++ b/kubernetes/dcaemod/requirements.yaml @@ -14,33 +14,33 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: dcaemod-genprocessor - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcaemod-genprocessor' condition: dcaemod-genprocessor.enabled - name: dcaemod-distributor-api - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcaemod-distributor-api' condition: dcaemod-distributor-api.enabled - name: dcaemod-designtool - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcaemod-designtool' condition: dcaemod-designtool.enabled - name: dcaemod-onboarding-api - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcaemod-onboarding-api' condition: dcaemod-onboarding-api.enabled - name: dcaemod-runtime-api - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcaemod-runtime-api' condition: dcaemod-runtime-api.enabled - name: dcaemod-nifi-registry - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcaemod-nifi-registry' condition: dcaemod-nifi-registry.enabled - name: dcaemod-healthcheck - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dcaemod-healthcheck' condition: dcaemod-healthcheck.enabled
\ No newline at end of file diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml index e93a2f45a0..1656ada853 100644 --- a/kubernetes/dmaap/Chart.yaml +++ b/kubernetes/dmaap/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP DMaaP components name: dmaap -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml index 6832e0286d..86bdbb31fc 100644 --- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml +++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes name: dmaap-bc -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml index b8c7f9ac3e..5a386b1dda 100644 --- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml +++ b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml @@ -14,15 +14,15 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: postgres - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: PG.enabled - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml index 161e1e6dc9..58ed1d810f 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP DMaaP Data Router Node Server name: dmaap-dr-node -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml index f8139e0f97..5773980bcb 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml @@ -20,8 +20,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml index 6111f3e4ad..65effe00b8 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP DMaaP Data Router Provisioning Server name: dmaap-dr-prov -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml index 24ca0c9227..b6997b93e3 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml @@ -20,15 +20,15 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera alias: mariadb - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml index 98bd2958cb..3f1c509789 100644 --- a/kubernetes/dmaap/components/message-router/Chart.yaml +++ b/kubernetes/dmaap/components/message-router/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Message Router name: message-router -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml index f3258bc886..83700a71fa 100644 --- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml +++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 description: ONAP Message Router Kafka Service name: message-router-kafka -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml index 99d60642cc..21c9afa7f1 100644 --- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml +++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml @@ -15,12 +15,12 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml index b3d6247226..60cea851eb 100644 --- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml +++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 description: ONAP Dmaap Message Router Zookeeper Service name: message-router-zookeeper -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml index 99d60642cc..21c9afa7f1 100644 --- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml +++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml @@ -15,12 +15,12 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml index 1f1d45aaba..a46aa428dd 100644 --- a/kubernetes/dmaap/components/message-router/requirements.yaml +++ b/kubernetes/dmaap/components/message-router/requirements.yaml @@ -15,17 +15,17 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: message-router-kafka - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/message-router-kafka' - name: message-router-zookeeper - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/message-router-zookeeper' diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml index 9cd0ba6a38..6904e68fda 100644 --- a/kubernetes/dmaap/requirements.yaml +++ b/kubernetes/dmaap/requirements.yaml @@ -15,21 +15,21 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: message-router - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/message-router' condition: message-router.enabled - name: dmaap-bc - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dmaap-bc' condition: dmaap-bc.enabled - name: dmaap-dr-node - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dmaap-dr-node' condition: dmaap-dr-node.enabled - name: dmaap-dr-prov - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dmaap-dr-prov' condition: dmaap-dr-prov.enabled diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml index 1f6ed986ea..b1c100b260 100644 --- a/kubernetes/esr/Chart.yaml +++ b/kubernetes/esr/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP External System Register name: esr -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/esr/components/esr-gui/Chart.yaml b/kubernetes/esr/components/esr-gui/Chart.yaml index c8d97bd67f..8794421d84 100644 --- a/kubernetes/esr/components/esr-gui/Chart.yaml +++ b/kubernetes/esr/components/esr-gui/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP External System Register GUI name: esr-gui -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/esr/components/esr-gui/requirements.yaml b/kubernetes/esr/components/esr-gui/requirements.yaml index 0b77abe706..2161e6e16e 100644 --- a/kubernetes/esr/components/esr-gui/requirements.yaml +++ b/kubernetes/esr/components/esr-gui/requirements.yaml @@ -15,11 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/esr/components/esr-server/Chart.yaml b/kubernetes/esr/components/esr-server/Chart.yaml index 79c7b9d53e..9cd8ba3120 100644 --- a/kubernetes/esr/components/esr-server/Chart.yaml +++ b/kubernetes/esr/components/esr-server/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP External System Register GUI name: esr-server -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/esr/components/esr-server/requirements.yaml b/kubernetes/esr/components/esr-server/requirements.yaml index 0b77abe706..2161e6e16e 100644 --- a/kubernetes/esr/components/esr-server/requirements.yaml +++ b/kubernetes/esr/components/esr-server/requirements.yaml @@ -15,11 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/esr/requirements.yaml b/kubernetes/esr/requirements.yaml index 8c2a82dedc..1617572bb2 100644 --- a/kubernetes/esr/requirements.yaml +++ b/kubernetes/esr/requirements.yaml @@ -15,9 +15,9 @@ dependencies: - name: esr-gui - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/esr-gui' condition: esr-gui.enabled - name: esr-server - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/esr-server' diff --git a/kubernetes/helm/starters/onap-app/Chart.yaml b/kubernetes/helm/starters/onap-app/Chart.yaml index 38f54c2f77..435c05d764 100644 --- a/kubernetes/helm/starters/onap-app/Chart.yaml +++ b/kubernetes/helm/starters/onap-app/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: <Short application description - this is visible via 'helm search'> name: <onap-app> -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/helm/starters/onap-app/requirements.yaml b/kubernetes/helm/starters/onap-app/requirements.yaml index b8e59b0910..5422be8870 100644 --- a/kubernetes/helm/starters/onap-app/requirements.yaml +++ b/kubernetes/helm/starters/onap-app/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/log/Chart.yaml b/kubernetes/log/Chart.yaml index 695f72f8d7..7d53ecd77a 100644 --- a/kubernetes/log/Chart.yaml +++ b/kubernetes/log/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Logging ElasticStack name: log -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/log/components/log-elasticsearch/Chart.yaml b/kubernetes/log/components/log-elasticsearch/Chart.yaml index 66b0257e35..0ca88f5c6a 100644 --- a/kubernetes/log/components/log-elasticsearch/Chart.yaml +++ b/kubernetes/log/components/log-elasticsearch/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Logging Elasticsearch name: log-elasticsearch -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/log/components/log-elasticsearch/requirements.yaml b/kubernetes/log/components/log-elasticsearch/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/log/components/log-elasticsearch/requirements.yaml +++ b/kubernetes/log/components/log-elasticsearch/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml b/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml index 6a0e6d2e3d..b778af8564 100644 --- a/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml +++ b/kubernetes/log/components/log-elasticsearch/templates/deployment.yaml @@ -26,6 +26,9 @@ metadata: release: {{ include "common.release" . }} heritage: {{ .Release.Service }} spec: + selector: + matchLabels: + app: {{ include "common.name" . }} replicas: {{ .Values.replicaCount }} template: metadata: diff --git a/kubernetes/log/components/log-kibana/Chart.yaml b/kubernetes/log/components/log-kibana/Chart.yaml index 8f5d973177..96a2c82bec 100644 --- a/kubernetes/log/components/log-kibana/Chart.yaml +++ b/kubernetes/log/components/log-kibana/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Logging Kibana name: log-kibana -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/log/components/log-kibana/requirements.yaml b/kubernetes/log/components/log-kibana/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/log/components/log-kibana/requirements.yaml +++ b/kubernetes/log/components/log-kibana/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/log/components/log-kibana/templates/deployment.yaml b/kubernetes/log/components/log-kibana/templates/deployment.yaml index a1824d2509..5e3dc98f84 100644 --- a/kubernetes/log/components/log-kibana/templates/deployment.yaml +++ b/kubernetes/log/components/log-kibana/templates/deployment.yaml @@ -26,6 +26,9 @@ metadata: release: {{ include "common.release" . }} heritage: {{ .Release.Service }} spec: + selector: + matchLabels: + app: {{ include "common.name" . }} replicas: {{ .Values.replicaCount }} template: metadata: diff --git a/kubernetes/log/components/log-logstash/Chart.yaml b/kubernetes/log/components/log-logstash/Chart.yaml index 8349548f86..b6b39d7e7a 100644 --- a/kubernetes/log/components/log-logstash/Chart.yaml +++ b/kubernetes/log/components/log-logstash/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Logging Logstash name: log-logstash -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/log/components/log-logstash/requirements.yaml b/kubernetes/log/components/log-logstash/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/log/components/log-logstash/requirements.yaml +++ b/kubernetes/log/components/log-logstash/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/log/components/log-logstash/templates/deployment.yaml b/kubernetes/log/components/log-logstash/templates/deployment.yaml index 566c7a3b10..92817fac88 100644 --- a/kubernetes/log/components/log-logstash/templates/deployment.yaml +++ b/kubernetes/log/components/log-logstash/templates/deployment.yaml @@ -26,6 +26,9 @@ metadata: release: {{ include "common.release" . }} heritage: {{ .Release.Service }} spec: + selector: + matchLabels: + app: {{ include "common.name" . }} replicas: {{ .Values.replicaCount }} template: metadata: diff --git a/kubernetes/log/requirements.yaml b/kubernetes/log/requirements.yaml index ae81fc8441..4455af60da 100644 --- a/kubernetes/log/requirements.yaml +++ b/kubernetes/log/requirements.yaml @@ -14,18 +14,18 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: log-elasticsearch - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/log-elasticsearch' - name: log-kibana - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/log-kibana' - name: log-logstash - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/log-logstash' diff --git a/kubernetes/modeling/Chart.yaml b/kubernetes/modeling/Chart.yaml index 613fb6bb58..93bd4a49d4 100644 --- a/kubernetes/modeling/Chart.yaml +++ b/kubernetes/modeling/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Modeling (Modeling) name: modeling -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml index c167da1770..58ece128e6 100644 --- a/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml +++ b/kubernetes/modeling/components/modeling-etsicatalog/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Modeling - Etsicatalog name: modeling-etsicatalog -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml index cadf452100..6f3e850d12 100644 --- a/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml +++ b/kubernetes/modeling/components/modeling-etsicatalog/requirements.yaml @@ -14,19 +14,19 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: global.mariadbGalera.localCluster - name: mariadb-init - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: not global.mariadbGalera.localCluster - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/modeling/requirements.yaml b/kubernetes/modeling/requirements.yaml index ada1ded2c4..d4b6c469f1 100644 --- a/kubernetes/modeling/requirements.yaml +++ b/kubernetes/modeling/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: modeling-etsicatalog - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/modeling-etsicatalog' diff --git a/kubernetes/msb/Chart.yaml b/kubernetes/msb/Chart.yaml index 1daccb5aaa..0123596573 100644 --- a/kubernetes/msb/Chart.yaml +++ b/kubernetes/msb/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP MicroServices Bus name: msb -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/msb/Makefile b/kubernetes/msb/Makefile new file mode 100644 index 0000000000..4c79718d02 --- /dev/null +++ b/kubernetes/msb/Makefile @@ -0,0 +1,51 @@ +# Copyright © 2020 Samsung Electronics +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +OUTPUT_DIR := $(ROOT_DIR)/../dist +PACKAGE_DIR := $(OUTPUT_DIR)/packages +SECRET_DIR := $(OUTPUT_DIR)/secrets + +EXCLUDES := dist resources templates charts docker +HELM_BIN := helm +HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) + +.PHONY: $(EXCLUDES) $(HELM_CHARTS) + +all: $(HELM_CHARTS) + +$(HELM_CHARTS): + @echo "\n[$@]" + @make package-$@ + +make-%: + @if [ -f $*/Makefile ]; then make -C $*; fi + +dep-%: make-% + @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi + +lint-%: dep-% + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi + +package-%: lint-% + @mkdir -p $(PACKAGE_DIR) + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi + @$(HELM_BIN) repo index $(PACKAGE_DIR) + +clean: + @rm -f */requirements.lock + @rm -f *tgz */charts/*tgz + @rm -rf $(PACKAGE_DIR) +%: + @: diff --git a/kubernetes/msb/charts/msb-iag/requirements.yaml b/kubernetes/msb/charts/msb-iag/requirements.yaml deleted file mode 100644 index 93232216fb..0000000000 --- a/kubernetes/msb/charts/msb-iag/requirements.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada , ZTE -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -dependencies: - - name: common - version: ~6.x-0 - repository: '@local' diff --git a/kubernetes/msb/components/Makefile b/kubernetes/msb/components/Makefile new file mode 100644 index 0000000000..bf267b7720 --- /dev/null +++ b/kubernetes/msb/components/Makefile @@ -0,0 +1,51 @@ +# Copyright © 2020 Samsung Electronics +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) +OUTPUT_DIR := $(ROOT_DIR)/../../dist +PACKAGE_DIR := $(OUTPUT_DIR)/packages +SECRET_DIR := $(OUTPUT_DIR)/secrets + +EXCLUDES := +HELM_BIN := helm +HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.)))) + +.PHONY: $(EXCLUDES) $(HELM_CHARTS) + +all: $(HELM_CHARTS) + +$(HELM_CHARTS): + @echo "\n[$@]" + @make package-$@ + +make-%: + @if [ -f $*/Makefile ]; then make -C $*; fi + +dep-%: make-% + @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi + +lint-%: dep-% + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi + +package-%: lint-% + @mkdir -p $(PACKAGE_DIR) + @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi + @$(HELM_BIN) repo index $(PACKAGE_DIR) + +clean: + @rm -f */requirements.lock + @rm -f *tgz */charts/*tgz + @rm -rf $(PACKAGE_DIR) +%: + @: diff --git a/kubernetes/msb/charts/kube2msb/.helmignore b/kubernetes/msb/components/kube2msb/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/msb/charts/kube2msb/.helmignore +++ b/kubernetes/msb/components/kube2msb/.helmignore diff --git a/kubernetes/msb/charts/kube2msb/Chart.yaml b/kubernetes/msb/components/kube2msb/Chart.yaml index 91d98c50d2..10c9818098 100644 --- a/kubernetes/msb/charts/kube2msb/Chart.yaml +++ b/kubernetes/msb/components/kube2msb/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP MicroServices Bus Kube2MSB Registrator name: kube2msb -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/msb/charts/kube2msb/requirements.yaml b/kubernetes/msb/components/kube2msb/requirements.yaml index 93232216fb..467a52ab21 100644 --- a/kubernetes/msb/charts/kube2msb/requirements.yaml +++ b/kubernetes/msb/components/kube2msb/requirements.yaml @@ -13,5 +13,8 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml b/kubernetes/msb/components/kube2msb/templates/deployment.yaml index 3d0dcd63ba..ed99deea43 100644 --- a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml +++ b/kubernetes/msb/components/kube2msb/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: KUBE_MASTER_URL diff --git a/kubernetes/msb/charts/kube2msb/values.yaml b/kubernetes/msb/components/kube2msb/values.yaml index 3c67227873..d2a0a15f49 100644 --- a/kubernetes/msb/charts/kube2msb/values.yaml +++ b/kubernetes/msb/components/kube2msb/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/oom/kube2msb:1.2.6 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-consul/.helmignore b/kubernetes/msb/components/msb-consul/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/msb/charts/msb-consul/.helmignore +++ b/kubernetes/msb/components/msb-consul/.helmignore diff --git a/kubernetes/msb/charts/msb-consul/Chart.yaml b/kubernetes/msb/components/msb-consul/Chart.yaml index c5dada93d4..fc4f22463b 100644 --- a/kubernetes/msb/charts/msb-consul/Chart.yaml +++ b/kubernetes/msb/components/msb-consul/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP MicroServices Bus Consul name: msb-consul -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/msb/charts/msb-eag/requirements.yaml b/kubernetes/msb/components/msb-consul/requirements.yaml index 93232216fb..467a52ab21 100644 --- a/kubernetes/msb/charts/msb-eag/requirements.yaml +++ b/kubernetes/msb/components/msb-consul/requirements.yaml @@ -13,5 +13,8 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/msb/charts/msb-consul/resources/docker-entrypoint.sh b/kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh index 0cd46167e4..0cd46167e4 100755 --- a/kubernetes/msb/charts/msb-consul/resources/docker-entrypoint.sh +++ b/kubernetes/msb/components/msb-consul/resources/docker-entrypoint.sh diff --git a/kubernetes/msb/charts/msb-consul/templates/NOTES.txt b/kubernetes/msb/components/msb-consul/templates/NOTES.txt index e0cea22074..e0cea22074 100644 --- a/kubernetes/msb/charts/msb-consul/templates/NOTES.txt +++ b/kubernetes/msb/components/msb-consul/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-consul/templates/configmap.yaml b/kubernetes/msb/components/msb-consul/templates/configmap.yaml index 32adcaec5f..32adcaec5f 100644 --- a/kubernetes/msb/charts/msb-consul/templates/configmap.yaml +++ b/kubernetes/msb/components/msb-consul/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml b/kubernetes/msb/components/msb-consul/templates/deployment.yaml index c7472cca72..97dd1781f2 100644 --- a/kubernetes/msb/charts/msb-consul/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-consul/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: msb containers: - name: {{ include "common.name" . }} - image: "{{ .Values.global.dockerHubRepository | default .Values.dockerHubRepository }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} securityContext: runAsUser: {{ .Values.securityContext.runAsUser }} diff --git a/kubernetes/msb/charts/msb-consul/templates/ingress.yaml b/kubernetes/msb/components/msb-consul/templates/ingress.yaml index 8f87c68f1e..8f87c68f1e 100644 --- a/kubernetes/msb/charts/msb-consul/templates/ingress.yaml +++ b/kubernetes/msb/components/msb-consul/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-consul/templates/service.yaml b/kubernetes/msb/components/msb-consul/templates/service.yaml index af735b6e74..af735b6e74 100644 --- a/kubernetes/msb/charts/msb-consul/templates/service.yaml +++ b/kubernetes/msb/components/msb-consul/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-consul/values.yaml b/kubernetes/msb/components/msb-consul/values.yaml index 4704f3b24d..1c7fa38171 100644 --- a/kubernetes/msb/charts/msb-consul/values.yaml +++ b/kubernetes/msb/components/msb-consul/values.yaml @@ -21,7 +21,6 @@ global: # Application configuration defaults. ################################################################# # application image -dockerHubRepository: docker.io image: library/consul:1.4.3 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-discovery/.helmignore b/kubernetes/msb/components/msb-discovery/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/msb/charts/msb-discovery/.helmignore +++ b/kubernetes/msb/components/msb-discovery/.helmignore diff --git a/kubernetes/msb/charts/msb-discovery/Chart.yaml b/kubernetes/msb/components/msb-discovery/Chart.yaml index 1eee4564de..527af56f06 100644 --- a/kubernetes/msb/charts/msb-discovery/Chart.yaml +++ b/kubernetes/msb/components/msb-discovery/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP MicroServices Bus Discovery name: msb-discovery -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/msb/charts/msb-consul/requirements.yaml b/kubernetes/msb/components/msb-discovery/requirements.yaml index 93232216fb..467a52ab21 100644 --- a/kubernetes/msb/charts/msb-consul/requirements.yaml +++ b/kubernetes/msb/components/msb-discovery/requirements.yaml @@ -13,5 +13,8 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/msb/charts/msb-discovery/resources/config/logback.xml b/kubernetes/msb/components/msb-discovery/resources/config/logback.xml index 3781d96328..3781d96328 100644 --- a/kubernetes/msb/charts/msb-discovery/resources/config/logback.xml +++ b/kubernetes/msb/components/msb-discovery/resources/config/logback.xml diff --git a/kubernetes/msb/charts/msb-discovery/templates/NOTES.txt b/kubernetes/msb/components/msb-discovery/templates/NOTES.txt index e0cea22074..e0cea22074 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/NOTES.txt +++ b/kubernetes/msb/components/msb-discovery/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-discovery/templates/configmap.yaml b/kubernetes/msb/components/msb-discovery/templates/configmap.yaml index 33c77e5eae..33c77e5eae 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/configmap.yaml +++ b/kubernetes/msb/components/msb-discovery/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml index bcb9da55a1..e5e5f9eb0f 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -94,7 +94,7 @@ spec: # Filebeat sidecar container - name: {{ include "common.name" . }}-filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/msb/charts/msb-discovery/templates/ingress.yaml b/kubernetes/msb/components/msb-discovery/templates/ingress.yaml index 8f87c68f1e..8f87c68f1e 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/ingress.yaml +++ b/kubernetes/msb/components/msb-discovery/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-discovery/templates/service.yaml b/kubernetes/msb/components/msb-discovery/templates/service.yaml index af735b6e74..af735b6e74 100644 --- a/kubernetes/msb/charts/msb-discovery/templates/service.yaml +++ b/kubernetes/msb/components/msb-discovery/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/components/msb-discovery/values.yaml index 4ac27a8f9d..994e84b722 100644 --- a/kubernetes/msb/charts/msb-discovery/values.yaml +++ b/kubernetes/msb/components/msb-discovery/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/msb/msb_discovery:1.2.6 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-eag/.helmignore b/kubernetes/msb/components/msb-eag/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/msb/charts/msb-eag/.helmignore +++ b/kubernetes/msb/components/msb-eag/.helmignore diff --git a/kubernetes/msb/charts/msb-eag/Chart.yaml b/kubernetes/msb/components/msb-eag/Chart.yaml index 78a0e3eef1..c1843627a8 100644 --- a/kubernetes/msb/charts/msb-eag/Chart.yaml +++ b/kubernetes/msb/components/msb-eag/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP MicroServices Bus Internal API Gateway name: msb-eag -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/msb/charts/msb-discovery/requirements.yaml b/kubernetes/msb/components/msb-eag/requirements.yaml index 93232216fb..c59eb6fdf9 100644 --- a/kubernetes/msb/charts/msb-discovery/requirements.yaml +++ b/kubernetes/msb/components/msb-eag/requirements.yaml @@ -13,5 +13,8 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local'
\ No newline at end of file diff --git a/kubernetes/msb/charts/msb-eag/resources/config/log/logback.xml b/kubernetes/msb/components/msb-eag/resources/config/log/logback.xml index 680cb7357a..680cb7357a 100644 --- a/kubernetes/msb/charts/msb-eag/resources/config/log/logback.xml +++ b/kubernetes/msb/components/msb-eag/resources/config/log/logback.xml diff --git a/kubernetes/msb/charts/msb-eag/resources/config/logback.xml b/kubernetes/msb/components/msb-eag/resources/config/logback.xml index 6dc4443d6e..6dc4443d6e 100644 --- a/kubernetes/msb/charts/msb-eag/resources/config/logback.xml +++ b/kubernetes/msb/components/msb-eag/resources/config/logback.xml diff --git a/kubernetes/msb/charts/msb-eag/templates/NOTES.txt b/kubernetes/msb/components/msb-eag/templates/NOTES.txt index e0cea22074..e0cea22074 100644 --- a/kubernetes/msb/charts/msb-eag/templates/NOTES.txt +++ b/kubernetes/msb/components/msb-eag/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-eag/templates/configmap.yaml b/kubernetes/msb/components/msb-eag/templates/configmap.yaml index 33c77e5eae..33c77e5eae 100644 --- a/kubernetes/msb/charts/msb-eag/templates/configmap.yaml +++ b/kubernetes/msb/components/msb-eag/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml b/kubernetes/msb/components/msb-eag/templates/deployment.yaml index 8ce19fb304..36cb13dc52 100644 --- a/kubernetes/msb/charts/msb-eag/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-eag/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -108,7 +108,7 @@ spec: {{- end }} # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/msb/charts/msb-eag/templates/ingress.yaml b/kubernetes/msb/components/msb-eag/templates/ingress.yaml index 8f87c68f1e..8f87c68f1e 100644 --- a/kubernetes/msb/charts/msb-eag/templates/ingress.yaml +++ b/kubernetes/msb/components/msb-eag/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-eag/templates/service.yaml b/kubernetes/msb/components/msb-eag/templates/service.yaml index e8e3a8a947..e8e3a8a947 100644 --- a/kubernetes/msb/charts/msb-eag/templates/service.yaml +++ b/kubernetes/msb/components/msb-eag/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml index f63964cd15..b8813b8f1a 100644 --- a/kubernetes/msb/charts/msb-eag/values.yaml +++ b/kubernetes/msb/components/msb-eag/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/msb/msb_apigateway:1.2.7 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/charts/msb-iag/.helmignore b/kubernetes/msb/components/msb-iag/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/msb/charts/msb-iag/.helmignore +++ b/kubernetes/msb/components/msb-iag/.helmignore diff --git a/kubernetes/msb/charts/msb-iag/Chart.yaml b/kubernetes/msb/components/msb-iag/Chart.yaml index 533eda6b6b..9b8d56c3a3 100644 --- a/kubernetes/msb/charts/msb-iag/Chart.yaml +++ b/kubernetes/msb/components/msb-iag/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP MicroServices Bus Internal API Gateway name: msb-iag -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/msb/components/msb-iag/requirements.yaml b/kubernetes/msb/components/msb-iag/requirements.yaml new file mode 100644 index 0000000000..467a52ab21 --- /dev/null +++ b/kubernetes/msb/components/msb-iag/requirements.yaml @@ -0,0 +1,20 @@ +# Copyright © 2018 Amdocs, Bell Canada , ZTE +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +dependencies: + - name: common + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/msb/charts/msb-iag/resources/config/log/logback.xml b/kubernetes/msb/components/msb-iag/resources/config/log/logback.xml index 680cb7357a..680cb7357a 100644 --- a/kubernetes/msb/charts/msb-iag/resources/config/log/logback.xml +++ b/kubernetes/msb/components/msb-iag/resources/config/log/logback.xml diff --git a/kubernetes/msb/charts/msb-iag/resources/config/logback.xml b/kubernetes/msb/components/msb-iag/resources/config/logback.xml index 65ff43485a..65ff43485a 100644 --- a/kubernetes/msb/charts/msb-iag/resources/config/logback.xml +++ b/kubernetes/msb/components/msb-iag/resources/config/logback.xml diff --git a/kubernetes/msb/charts/msb-iag/templates/NOTES.txt b/kubernetes/msb/components/msb-iag/templates/NOTES.txt index e0cea22074..e0cea22074 100644 --- a/kubernetes/msb/charts/msb-iag/templates/NOTES.txt +++ b/kubernetes/msb/components/msb-iag/templates/NOTES.txt diff --git a/kubernetes/msb/charts/msb-iag/templates/configmap.yaml b/kubernetes/msb/components/msb-iag/templates/configmap.yaml index 33c77e5eae..33c77e5eae 100644 --- a/kubernetes/msb/charts/msb-iag/templates/configmap.yaml +++ b/kubernetes/msb/components/msb-iag/templates/configmap.yaml diff --git a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml b/kubernetes/msb/components/msb-iag/templates/deployment.yaml index 42f36cd279..00dc6b69b3 100644 --- a/kubernetes/msb/charts/msb-iag/templates/deployment.yaml +++ b/kubernetes/msb/components/msb-iag/templates/deployment.yaml @@ -49,12 +49,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -108,7 +108,7 @@ spec: {{- end }} # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - name: {{ include "common.fullname" . }}-filebeat-conf diff --git a/kubernetes/msb/charts/msb-iag/templates/ingress.yaml b/kubernetes/msb/components/msb-iag/templates/ingress.yaml index 8f87c68f1e..8f87c68f1e 100644 --- a/kubernetes/msb/charts/msb-iag/templates/ingress.yaml +++ b/kubernetes/msb/components/msb-iag/templates/ingress.yaml diff --git a/kubernetes/msb/charts/msb-iag/templates/service.yaml b/kubernetes/msb/components/msb-iag/templates/service.yaml index e8e3a8a947..e8e3a8a947 100644 --- a/kubernetes/msb/charts/msb-iag/templates/service.yaml +++ b/kubernetes/msb/components/msb-iag/templates/service.yaml diff --git a/kubernetes/msb/charts/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml index b1f19c9448..b91ddcae1b 100644 --- a/kubernetes/msb/charts/msb-iag/values.yaml +++ b/kubernetes/msb/components/msb-iag/values.yaml @@ -16,13 +16,11 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/msb/msb_apigateway:1.2.7 pullPolicy: Always istioSidecar: true diff --git a/kubernetes/msb/requirements.yaml b/kubernetes/msb/requirements.yaml index 93232216fb..c52bec4944 100644 --- a/kubernetes/msb/requirements.yaml +++ b/kubernetes/msb/requirements.yaml @@ -13,5 +13,23 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' + - name: kube2msb + version: ~7.x-0 + repository: 'file://components/kube2msb' + - name: msb-consul + version: ~7.x-0 + repository: 'file://components/msb-consul' + - name: msb-discovery + version: ~7.x-0 + repository: 'file://components/msb-discovery' + - name: msb-eag + version: ~7.x-0 + repository: 'file://components/msb-eag' + - name: msb-iag + version: ~7.x-0 + repository: 'file://components/msb-iag'
\ No newline at end of file diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml index 27fc008a5a..739fcea9d2 100644 --- a/kubernetes/msb/values.yaml +++ b/kubernetes/msb/values.yaml @@ -18,8 +18,6 @@ ################################################################# global: nodePortPrefix: 302 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 # application configuration config: diff --git a/kubernetes/multicloud/Chart.yaml b/kubernetes/multicloud/Chart.yaml index 8d59b87d8e..9fb7077924 100644 --- a/kubernetes/multicloud/Chart.yaml +++ b/kubernetes/multicloud/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP multicloud broker name: multicloud -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-azure/Chart.yaml b/kubernetes/multicloud/components/multicloud-azure/Chart.yaml index 578123c2a6..38ebed0141 100644 --- a/kubernetes/multicloud/components/multicloud-azure/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-azure/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP multicloud Azure plugin name: multicloud-azure -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-azure/requirements.yaml b/kubernetes/multicloud/components/multicloud-azure/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/multicloud/components/multicloud-azure/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-azure/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml index a392ba25a4..c65ffa4e8e 100644 --- a/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-fcaps/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP multicloud OpenStack fcaps Plugin name: multicloud-fcaps -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-fcaps/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml index cbd8da9bec..e80e1673f0 100644 --- a/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-k8s/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Multicloud Kubernetes Plugin name: multicloud-k8s -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml index 9071fafece..b6521b3de5 100644 --- a/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-k8s/requirements.yaml @@ -14,17 +14,17 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: mongo - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: etcd - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml index e86273c90b..7bad8308c5 100644 --- a/kubernetes/multicloud/components/multicloud-pike/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-pike/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP multicloud OpenStack Pike Plugin name: multicloud-pike -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/multicloud/components/multicloud-pike/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-pike/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml index 0f5533dbb5..7c2b2930f7 100644 --- a/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-prometheus/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Multicloud Prometheus name: multicloud-prometheus -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml index 52116145b4..d041498691 100644 --- a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Multicloud Prometheus Alert Manager name: prometheus-alertmanager -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml index 1456eff4e7..164e6a068a 100644 --- a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Multicloud Grafana for Prometheus name: prometheus-grafana -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml index 1fba2ae385..6b82867445 100644 --- a/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-starlingx/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP multicloud OpenStack Starlingx Plugin name: multicloud-starlingx -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-starlingx/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml index 4bb6ba05d5..fa5ba3e380 100644 --- a/kubernetes/multicloud/components/multicloud-vio/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-vio/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP multicloud VIO plugin name: multicloud-vio -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/multicloud/components/multicloud-vio/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-vio/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml index eadb375669..3627165159 100644 --- a/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml +++ b/kubernetes/multicloud/components/multicloud-windriver/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP multicloud OpenStack WindRiver Plugin name: multicloud-windriver -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml index bdc19209e7..0328610623 100644 --- a/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml +++ b/kubernetes/multicloud/components/multicloud-windriver/requirements.yaml @@ -15,8 +15,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/multicloud/requirements.yaml b/kubernetes/multicloud/requirements.yaml index a37b9f7a83..12b0fea958 100644 --- a/kubernetes/multicloud/requirements.yaml +++ b/kubernetes/multicloud/requirements.yaml @@ -15,40 +15,40 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: multicloud-azure - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-azure' condition: multicloud-azure.enabled - name: multicloud-fcaps - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-fcaps' condition: multicloud-fcaps.enabled - name: multicloud-k8s - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-k8s' condition: multicloud-k8s.enabled - name: multicloud-pike - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-pike' condition: multicloud-pike.enabled - name: multicloud-prometheus - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-prometheus' condition: multicloud-prometheus.enabled - name: multicloud-starlingx - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-starlingx' condition: multicloud-starlingx.enabled - name: multicloud-vio - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-vio' condition: multicloud-vio.enabled - name: multicloud-windriver - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/multicloud-windriver' condition: multicloud-windriver.enabled diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml index ad00218cba..d30b4f1a95 100644 --- a/kubernetes/nbi/Chart.yaml +++ b/kubernetes/nbi/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Northbound Interface name: nbi -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml index f76d598417..1efd721b6d 100644 --- a/kubernetes/nbi/requirements.yaml +++ b/kubernetes/nbi/requirements.yaml @@ -15,25 +15,25 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mongo - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: global.mariadbGalera.localCluster - name: mariadb-init - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: not global.mariadbGalera.localCluster - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml index 874d498284..a9be436ae5 100644 --- a/kubernetes/onap/Chart.yaml +++ b/kubernetes/onap/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 name: onap -version: 6.0.0 +version: 7.0.0 appVersion: Frankfurt description: Open Network Automation Platform (ONAP) home: https://www.onap.org/ diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml index 51f1743773..5f0c430ad8 100755 --- a/kubernetes/onap/requirements.yaml +++ b/kubernetes/onap/requirements.yaml @@ -20,148 +20,148 @@ # > helm repo add local http://127.0.0.1:8879 dependencies: - name: aaf - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: aaf.enabled - name: aai - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: aai.enabled - name: appc - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: appc.enabled - name: cassandra - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: cassandra.enabled - name: cds - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: cds.enabled - name: clamp - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: clamp.enabled - name: cli - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: cli.enabled - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: consul - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: consul.enabled - name: contrib - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: global.addTestingComponents - name: dcaegen2 - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: dcaegen2.enabled - name: dcaemod - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: dcaemod.enabled - name: dmaap - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: dmaap.enabled - name: esr - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: esr.enabled - name: log - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: log.enabled - name: sniro-emulator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: sniro-emulator.enabled - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: mariadb-galera.enabled - name: msb - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: msb.enabled - name: multicloud - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: multicloud.enabled - name: nbi - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: nbi.enabled - name: policy - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: policy.enabled - name: pomba - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: pomba.enabled - name: portal - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: portal.enabled - name: oof - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: oof.enabled - name: repository-wrapper - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: robot - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: robot.enabled - name: sdc - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: sdc.enabled - name: sdnc - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: sdnc.enabled - name: so - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: so.enabled - name: uui - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: uui.enabled - name: vfc - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: vfc.enabled - name: vid - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: vid.enabled - name: vnfsdk - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: vnfsdk.enabled - name: modeling - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: modeling.enabled - name: platform - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: platform.enabled - name: a1policymanagement - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: a1policymanagement.enabled - name: cert-wrapper - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: cert-wrapper.enabled diff --git a/kubernetes/oof/Chart.yaml b/kubernetes/oof/Chart.yaml index d8a5b3383e..a19fdfdaa8 100755 --- a/kubernetes/oof/Chart.yaml +++ b/kubernetes/oof/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Optimization Framework name: oof -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-cmso/Chart.yaml b/kubernetes/oof/components/oof-cmso/Chart.yaml index a21ed25927..56f98ca953 100644 --- a/kubernetes/oof/components/oof-cmso/Chart.yaml +++ b/kubernetes/oof/components/oof-cmso/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Chart for Change Management Service Orchestrator (CMSO) name: oof-cmso -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml index 7b55f08569..baa5af7427 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Chart for Change Management Service Orchestrator (CMSO) Optimizer name: oof-cmso-optimizer -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml index 2b3543a04f..d6eecb77e2 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-optimizer/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml index 09150985db..e472bc0ab9 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Chart for Change Management Service Orchestrator (CMSO) Service name: oof-cmso-service -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml index 6a956790c7..8dfadb0613 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-service/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml index 030b3f63d0..78d6b7b913 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Chart for Change Management Service Orchestrator (CMSO) Ticket Management name: oof-cmso-ticketmgt -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml index 6a956790c7..8dfadb0613 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-ticketmgt/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml index 006d6c5a2c..e4264747a5 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: Chart for Change Management Service Orchestrator (CMSO) Service name: oof-cmso-topology -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml index 6a956790c7..8dfadb0613 100644 --- a/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml +++ b/kubernetes/oof/components/oof-cmso/components/oof-cmso-topology/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-cmso/requirements.yaml b/kubernetes/oof/components/oof-cmso/requirements.yaml index 0e79ed0250..0222215a7f 100644 --- a/kubernetes/oof/components/oof-cmso/requirements.yaml +++ b/kubernetes/oof/components/oof-cmso/requirements.yaml @@ -15,33 +15,33 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-init - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-cmso-optimizer - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-cmso-optimizer' condition: oof-cmso-optimizer.enabled - name: oof-cmso-service - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-cmso-service' condition: oof-cmso-service.enabled - name: oof-cmso-ticketmgt - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-cmso-ticketmgt' condition: oof-cmso-ticketmgt.enabled - name: oof-cmso-topology - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-cmso-topology' condition: oof-cmso-topology.enabled - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-has/Chart.yaml b/kubernetes/oof/components/oof-has/Chart.yaml index 3d507e913d..15d826d546 100755 --- a/kubernetes/oof/components/oof-has/Chart.yaml +++ b/kubernetes/oof/components/oof-has/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Homing and Allocation Service name: oof-has -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml index 231021ddcd..a22895dc26 100755 --- a/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-api/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Homing and Allocation Servicei - API name: oof-has-api -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml index f9673d5b32..5d047e1563 100644 --- a/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-api/requirements.yaml @@ -14,14 +14,14 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../oof-templates' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml index 91310cb879..f482907646 100755 --- a/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Homing and Allocation Sservice - Controller name: oof-has-controller -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml index 8fde52a4c6..0925692e08 100644 --- a/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-controller/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../oof-templates' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml index 23cc3ca73c..8b8255e6c9 100755 --- a/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-data/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Homing and Allocation Service - Data Component name: oof-has-data -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml index 8fde52a4c6..0925692e08 100644 --- a/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-data/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../oof-templates' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml index bc6db44850..31becd72b3 100755 --- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Homing and Allocation Sevice - Reservation Component name: oof-has-reservation -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml index 8fde52a4c6..0925692e08 100644 --- a/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-reservation/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../oof-templates' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml index 8cedfd5b01..6e3afa98bf 100755 --- a/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Homing and Allocation Service - Solver Component name: oof-has-solver -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml b/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml index 8fde52a4c6..0925692e08 100644 --- a/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml +++ b/kubernetes/oof/components/oof-has/components/oof-has-solver/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../../../oof-templates' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-has/requirements.yaml b/kubernetes/oof/components/oof-has/requirements.yaml index d21a124449..e2238760f5 100755 --- a/kubernetes/oof/components/oof-has/requirements.yaml +++ b/kubernetes/oof/components/oof-has/requirements.yaml @@ -15,31 +15,31 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: music - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-has-api - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-has-api' condition: oof-has-api.enabled - name: oof-has-controller - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-has-controller' condition: oof-has-controller.enabled - name: oof-has-data - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-has-data' condition: oof-has-data.enabled - name: oof-has-reservation - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-has-reservation' condition: oof-has-reservation.enabled - name: oof-has-solver - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-has-solver' condition: oof-has-solver.enabled - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/components/oof-templates/Chart.yaml b/kubernetes/oof/components/oof-templates/Chart.yaml index 885491c1a9..2c0af907da 100755 --- a/kubernetes/oof/components/oof-templates/Chart.yaml +++ b/kubernetes/oof/components/oof-templates/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP OOF helm templates name: oof-templates -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/oof/components/oof-templates/requirements.yaml b/kubernetes/oof/components/oof-templates/requirements.yaml index b93260a4fa..0205417dcc 100755 --- a/kubernetes/oof/components/oof-templates/requirements.yaml +++ b/kubernetes/oof/components/oof-templates/requirements.yaml @@ -15,6 +15,6 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/oof/requirements.yaml b/kubernetes/oof/requirements.yaml index a68ce411f1..f3e82713f1 100755 --- a/kubernetes/oof/requirements.yaml +++ b/kubernetes/oof/requirements.yaml @@ -15,22 +15,22 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: oof-cmso - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-cmso' condition: oof-cmso.enabled - name: oof-has - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-has' condition: oof-has.enabled - name: oof-templates - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oof-templates' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/platform/Chart.yaml b/kubernetes/platform/Chart.yaml index 000f3b3fda..29adab7aad 100644 --- a/kubernetes/platform/Chart.yaml +++ b/kubernetes/platform/Chart.yaml @@ -17,4 +17,4 @@ apiVersion: v1 description: ONAP platform components name: platform -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/platform/components/oom-cert-service/Chart.yaml b/kubernetes/platform/components/oom-cert-service/Chart.yaml index dd99988868..5b222325d5 100644 --- a/kubernetes/platform/components/oom-cert-service/Chart.yaml +++ b/kubernetes/platform/components/oom-cert-service/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Cert Service name: oom-cert-service -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/platform/components/oom-cert-service/requirements.yaml b/kubernetes/platform/components/oom-cert-service/requirements.yaml index 26bc7a64d8..f1f5e645c9 100644 --- a/kubernetes/platform/components/oom-cert-service/requirements.yaml +++ b/kubernetes/platform/components/oom-cert-service/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/platform/requirements.yaml b/kubernetes/platform/requirements.yaml index 648197898d..a7ff4de4e1 100644 --- a/kubernetes/platform/requirements.yaml +++ b/kubernetes/platform/requirements.yaml @@ -17,5 +17,5 @@ dependencies: - name: oom-cert-service - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/oom-cert-service'
\ No newline at end of file diff --git a/kubernetes/policy/Chart.yaml b/kubernetes/policy/Chart.yaml index 57dd77ec37..d9f7cc8282 100755 --- a/kubernetes/policy/Chart.yaml +++ b/kubernetes/policy/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Policy name: policy -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml index d63683ed62..1659beb9f9 100755 --- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP Policy APEX PDP name: policy-apex-pdp -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml index 86751eae3c..c83882b0a1 100755 --- a/kubernetes/policy/components/policy-apex-pdp/requirements.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/requirements.yaml @@ -19,8 +19,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml index e9895c209b..08c1ba2db6 100755 --- a/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/templates/statefulset.yaml @@ -61,13 +61,13 @@ spec: name: apexconfig-input - mountPath: /config name: apexconfig - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config {{ include "common.certInitializer.initContainer" . | indent 6 }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["bash","-c"] args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \ diff --git a/kubernetes/policy/components/policy-apex-pdp/values.yaml b/kubernetes/policy/components/policy-apex-pdp/values.yaml index 23788e2532..6b13133815 100755 --- a/kubernetes/policy/components/policy-apex-pdp/values.yaml +++ b/kubernetes/policy/components/policy-apex-pdp/values.yaml @@ -22,8 +22,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - envsubstImage: dibi/envsubst aafEnabled: true persistence: {} @@ -51,7 +49,6 @@ secrets: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/policy-apex-pdp:2.4.4 pullPolicy: Always diff --git a/kubernetes/policy/components/policy-api/Chart.yaml b/kubernetes/policy/components/policy-api/Chart.yaml index 676a647e9a..cf661460f1 100755 --- a/kubernetes/policy/components/policy-api/Chart.yaml +++ b/kubernetes/policy/components/policy-api/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP Policy Design API name: policy-api -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-api/requirements.yaml b/kubernetes/policy/components/policy-api/requirements.yaml index c9502372be..a020de7d25 100755 --- a/kubernetes/policy/components/policy-api/requirements.yaml +++ b/kubernetes/policy/components/policy-api/requirements.yaml @@ -18,8 +18,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/policy/components/policy-api/templates/deployment.yaml b/kubernetes/policy/components/policy-api/templates/deployment.yaml index 021b49dc6d..72937ae0ef 100755 --- a/kubernetes/policy/components/policy-api/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-api/templates/deployment.yaml @@ -31,7 +31,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - command: @@ -53,13 +53,13 @@ spec: name: apiconfig - mountPath: /config name: apiconfig-processed - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config {{ include "common.certInitializer.initContainer" . | indent 8 }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} {{- if .Values.global.aafEnabled }} command: ["bash","-c"] diff --git a/kubernetes/policy/components/policy-api/values.yaml b/kubernetes/policy/components/policy-api/values.yaml index 6f0a590f47..3657bc1f53 100755 --- a/kubernetes/policy/components/policy-api/values.yaml +++ b/kubernetes/policy/components/policy-api/values.yaml @@ -22,9 +22,7 @@ global: nodePortPrefix: 304 persistence: {} - envsubstImage: dibi/envsubst aafEnabled: true - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Secrets metaconfig @@ -83,7 +81,6 @@ certInitializer: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/policy-api:2.3.3 pullPolicy: Always diff --git a/kubernetes/policy/components/policy-distribution/Chart.yaml b/kubernetes/policy/components/policy-distribution/Chart.yaml index db04d7cc6d..cc50e3a053 100755 --- a/kubernetes/policy/components/policy-distribution/Chart.yaml +++ b/kubernetes/policy/components/policy-distribution/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP Policy Distribution name: policy-distribution -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-distribution/requirements.yaml b/kubernetes/policy/components/policy-distribution/requirements.yaml index 12ce3e0067..ccd9ea8d15 100755 --- a/kubernetes/policy/components/policy-distribution/requirements.yaml +++ b/kubernetes/policy/components/policy-distribution/requirements.yaml @@ -19,8 +19,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/policy/components/policy-distribution/templates/deployment.yaml b/kubernetes/policy/components/policy-distribution/templates/deployment.yaml index 8dd06e8924..0f185fc735 100755 --- a/kubernetes/policy/components/policy-distribution/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-distribution/templates/deployment.yaml @@ -67,13 +67,13 @@ spec: name: distributionconfig-input - mountPath: /config name: distributionconfig - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config {{ include "common.certInitializer.initContainer" . | indent 6 }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} {{- if .Values.global.aafEnabled }} command: ["bash","-c"] diff --git a/kubernetes/policy/components/policy-distribution/values.yaml b/kubernetes/policy/components/policy-distribution/values.yaml index 4de0643354..a099bb6bf0 100755 --- a/kubernetes/policy/components/policy-distribution/values.yaml +++ b/kubernetes/policy/components/policy-distribution/values.yaml @@ -61,15 +61,12 @@ secrets: ################################################################# global: persistence: {} - envsubstImage: dibi/envsubst aafEnabled: true - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/policy-distribution:2.4.3 pullPolicy: Always diff --git a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml index 22567af862..dc0a39a12b 100755 --- a/kubernetes/policy/components/policy-drools-pdp/Chart.yaml +++ b/kubernetes/policy/components/policy-drools-pdp/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Drools Policy Engine (PDP-D) name: policy-drools-pdp -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml index ca24480fc8..41cef52240 100755 --- a/kubernetes/policy/components/policy-drools-pdp/requirements.yaml +++ b/kubernetes/policy/components/policy-drools-pdp/requirements.yaml @@ -15,8 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml index 1c9e18cc83..bf6f200c89 100755 --- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml +++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml @@ -49,7 +49,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-db-readiness {{- if not .Values.nexus.offline }} @@ -64,14 +64,14 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{- end }} {{ include "common.certInitializer.initContainer" . | indent 6 }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["bash","-c"] args: ["if [ -f {{ .Values.certInitializer.credsPath }}/.ci ]; then \ diff --git a/kubernetes/policy/components/policy-drools-pdp/values.yaml b/kubernetes/policy/components/policy-drools-pdp/values.yaml index 6c865d8369..c44691e275 100755 --- a/kubernetes/policy/components/policy-drools-pdp/values.yaml +++ b/kubernetes/policy/components/policy-drools-pdp/values.yaml @@ -18,10 +18,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - ubuntuImage: ubuntu:16.04 ################################################################# # Secrets metaconfig @@ -38,7 +34,6 @@ secrets: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/policy-pdpd-cl:1.7.5 pullPolicy: Always diff --git a/kubernetes/policy/components/policy-nexus/Chart.yaml b/kubernetes/policy/components/policy-nexus/Chart.yaml index 09103ed352..89c6a3d88e 100755 --- a/kubernetes/policy/components/policy-nexus/Chart.yaml +++ b/kubernetes/policy/components/policy-nexus/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Policy Nexus name: policy-nexus -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-nexus/requirements.yaml b/kubernetes/policy/components/policy-nexus/requirements.yaml index d3c442d32e..2161e6e16e 100755 --- a/kubernetes/policy/components/policy-nexus/requirements.yaml +++ b/kubernetes/policy/components/policy-nexus/requirements.yaml @@ -15,8 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml index 9b76e06be8..3d5d59fea2 100755 --- a/kubernetes/policy/components/policy-nexus/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-nexus/templates/deployment.yaml @@ -38,7 +38,7 @@ spec: spec: initContainers: - command: ["sh", "-c", "chown -R 200:200 /share"] - image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.global.ubuntuInitImage }}" + image: {{ include "repositoryGenerator.image.busybox" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-init volumeMounts: @@ -46,7 +46,7 @@ spec: name: nexus-data containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.externalPort }} diff --git a/kubernetes/policy/components/policy-nexus/values.yaml b/kubernetes/policy/components/policy-nexus/values.yaml index 69be914bd4..7801b525f2 100755 --- a/kubernetes/policy/components/policy-nexus/values.yaml +++ b/kubernetes/policy/components/policy-nexus/values.yaml @@ -18,16 +18,12 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - ubuntuInitRepository: oomk8s - ubuntuInitImage: ubuntu-init:1.0.0 persistence: {} ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: sonatype/nexus:2.14.13-01 pullPolicy: Always diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml index 6affa3432d..41e8056d07 100755 --- a/kubernetes/policy/components/policy-pap/Chart.yaml +++ b/kubernetes/policy/components/policy-pap/Chart.yaml @@ -20,4 +20,4 @@ apiVersion: v1 description: ONAP Policy Administration (PAP) name: policy-pap -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-pap/requirements.yaml b/kubernetes/policy/components/policy-pap/requirements.yaml index aa47b48548..ad7b6adfdb 100755 --- a/kubernetes/policy/components/policy-pap/requirements.yaml +++ b/kubernetes/policy/components/policy-pap/requirements.yaml @@ -19,8 +19,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/policy/components/policy-pap/templates/deployment.yaml b/kubernetes/policy/components/policy-pap/templates/deployment.yaml index 4f90d81b3b..85312bcdfd 100755 --- a/kubernetes/policy/components/policy-pap/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-pap/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - command: @@ -69,13 +69,13 @@ spec: name: papconfig - mountPath: /config name: papconfig-processed - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config {{ include "common.certInitializer.initContainer" . | indent 6 }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} {{- if .Values.global.aafEnabled }} command: ["bash","-c"] diff --git a/kubernetes/policy/components/policy-pap/values.yaml b/kubernetes/policy/components/policy-pap/values.yaml index 796fcd0a9f..0ab62ffa66 100755 --- a/kubernetes/policy/components/policy-pap/values.yaml +++ b/kubernetes/policy/components/policy-pap/values.yaml @@ -24,9 +24,7 @@ global: nodePortPrefixExt: 304 persistence: {} - envsubstImage: dibi/envsubst aafEnabled: true - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Secrets metaconfig @@ -97,7 +95,6 @@ certInitializer: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/policy-pap:2.3.3 pullPolicy: Always diff --git a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml index fda3fde208..9ac4459ffa 100755 --- a/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml +++ b/kubernetes/policy/components/policy-xacml-pdp/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: ONAP Policy XACML PDP (PDP-X) name: policy-xacml-pdp -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml index c9502372be..a020de7d25 100755 --- a/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml +++ b/kubernetes/policy/components/policy-xacml-pdp/requirements.yaml @@ -18,8 +18,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml index e8473d2125..449d84b9e8 100755 --- a/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml +++ b/kubernetes/policy/components/policy-xacml-pdp/templates/deployment.yaml @@ -51,7 +51,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - command: @@ -77,13 +77,13 @@ spec: name: pdpxconfig - mountPath: /config name: pdpxconfig-processed - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config {{ include "common.certInitializer.initContainer" . | indent 6 }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} {{- if .Values.global.aafEnabled }} command: ["bash","-c"] diff --git a/kubernetes/policy/components/policy-xacml-pdp/values.yaml b/kubernetes/policy/components/policy-xacml-pdp/values.yaml index 24be6c75c4..acc1d55002 100755 --- a/kubernetes/policy/components/policy-xacml-pdp/values.yaml +++ b/kubernetes/policy/components/policy-xacml-pdp/values.yaml @@ -21,9 +21,7 @@ ################################################################# global: persistence: {} - envsubstImage: dibi/envsubst aafEnabled: true - readinessImage: onap/oom/readiness:3.0.1 ################################################################# # Secrets metaconfig @@ -88,7 +86,6 @@ certInitializer: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/policy-xacml-pdp:2.3.3 pullPolicy: Always diff --git a/kubernetes/policy/requirements.yaml b/kubernetes/policy/requirements.yaml index 53ab55d047..b2f2b7430a 100755 --- a/kubernetes/policy/requirements.yaml +++ b/kubernetes/policy/requirements.yaml @@ -15,36 +15,39 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: policy-nexus - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/policy-nexus' condition: policy-nexus.enabled - name: policy-api - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/policy-api' condition: policy-api.enabled - name: policy-pap - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/policy-pap' condition: policy-pap.enabled - name: policy-xacml-pdp - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/policy-xacml-pdp' condition: policy-xacml-pdp.enabled - name: policy-apex-pdp - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/policy-apex-pdp' condition: policy-apex-pdp.enabled - name: policy-drools-pdp - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/policy-drools-pdp' condition: policy-drools-pdp.enabled - name: policy-distribution - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/policy-distribution' condition: policy-distribution.enabled + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml index 2c51728772..f2a55879ee 100755 --- a/kubernetes/policy/templates/job.yaml +++ b/kubernetes/policy/templates/job.yaml @@ -33,7 +33,7 @@ spec: initContainers: #This container checks that all galera instances are up before initializing it. - name: {{ include "common.name" . }}-readiness - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - /app/ready.py @@ -47,7 +47,7 @@ spec: fieldPath: metadata.namespace containers: - name: {{ include "common.release" . }}-policy-galera-config - image: {{ .Values.mariadb_image }} + image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.mariadb.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /dbcmd-config/db.sh diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml index 714f9d928c..a623c352fb 100755 --- a/kubernetes/policy/values.yaml +++ b/kubernetes/policy/values.yaml @@ -17,7 +17,6 @@ # Global configuration defaults. ################################################################# global: - readinessImage: onap/oom/readiness:3.0.1 aafEnabled: true mariadb: # '&mariadbConfig' means we "store" the values for later use in the file @@ -76,9 +75,11 @@ policy-nexus: ################################################################# repository: nexus3.onap.org:10001 -mariadb_image: library/mariadb:10 pullPolicy: Always +mariadb: + image: mariadb:10.5.8 + subChartsOnly: enabled: true diff --git a/kubernetes/pomba/Chart.yaml b/kubernetes/pomba/Chart.yaml index 7f96e60740..ed6f294113 100644 --- a/kubernetes/pomba/Chart.yaml +++ b/kubernetes/pomba/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Post Orchestration Model Based Audit name: pomba -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml index 92f1596141..30e62fc6d7 100644 --- a/kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml +++ b/kubernetes/pomba/components/pomba-aaictxbuilder/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA AAI Context Builder name: pomba-aaictxbuilder -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml +++ b/kubernetes/pomba/components/pomba-aaictxbuilder/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml b/kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml index 10dfcd743a..794e6332f1 100644 --- a/kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml +++ b/kubernetes/pomba/components/pomba-contextaggregator/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA Context Aggregator name: pomba-contextaggregator -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml b/kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml +++ b/kubernetes/pomba/components/pomba-contextaggregator/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-data-router/Chart.yaml b/kubernetes/pomba/components/pomba-data-router/Chart.yaml index ce2fbacfa6..e928528654 100644 --- a/kubernetes/pomba/components/pomba-data-router/Chart.yaml +++ b/kubernetes/pomba/components/pomba-data-router/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP POMBA Data-Router name: pomba-data-router -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-data-router/requirements.yaml b/kubernetes/pomba/components/pomba-data-router/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-data-router/requirements.yaml +++ b/kubernetes/pomba/components/pomba-data-router/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml b/kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml index 70efb7e2b4..10bc25400a 100644 --- a/kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml +++ b/kubernetes/pomba/components/pomba-elasticsearch/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA Elasticsearch name: pomba-elasticsearch -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml b/kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml +++ b/kubernetes/pomba/components/pomba-elasticsearch/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-kibana/Chart.yaml b/kubernetes/pomba/components/pomba-kibana/Chart.yaml index 111730ce49..58460fcff5 100644 --- a/kubernetes/pomba/components/pomba-kibana/Chart.yaml +++ b/kubernetes/pomba/components/pomba-kibana/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA Kibana name: pomba-kibana -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-kibana/requirements.yaml b/kubernetes/pomba/components/pomba-kibana/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-kibana/requirements.yaml +++ b/kubernetes/pomba/components/pomba-kibana/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml index 9f8d3651b8..f777057e5c 100644 --- a/kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscovery/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1
description: ONAP POMBA Network Discovery
name: pomba-networkdiscovery
-version: 6.0.0
+version: 7.0.0
diff --git a/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml b/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscovery/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml index d7cdd91aa3..1c9ae77c9e 100644 --- a/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA Network Discovery Context Builder name: pomba-networkdiscoveryctxbuilder -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml +++ b/kubernetes/pomba/components/pomba-networkdiscoveryctxbuilder/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml index c75c5a2c8f..8248d14083 100644 --- a/kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml +++ b/kubernetes/pomba/components/pomba-sdcctxbuilder/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA SDC Context Builder name: pomba-sdcctxbuilder -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml +++ b/kubernetes/pomba/components/pomba-sdcctxbuilder/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml index edd2385f55..66bd4ba2e0 100644 --- a/kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml +++ b/kubernetes/pomba/components/pomba-sdncctxbuilder/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA SDNC Context Builder name: pomba-sdncctxbuilder -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml b/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml +++ b/kubernetes/pomba/components/pomba-sdncctxbuilder/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-search-data/Chart.yaml b/kubernetes/pomba/components/pomba-search-data/Chart.yaml index 5f3bc0ae79..2aaf2d183a 100644 --- a/kubernetes/pomba/components/pomba-search-data/Chart.yaml +++ b/kubernetes/pomba/components/pomba-search-data/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP POMBA search-data name: pomba-search-data -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-search-data/requirements.yaml b/kubernetes/pomba/components/pomba-search-data/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-search-data/requirements.yaml +++ b/kubernetes/pomba/components/pomba-search-data/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml index d12b3f984d..022628b372 100644 --- a/kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml +++ b/kubernetes/pomba/components/pomba-servicedecomposition/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1
description: ONAP POMBA Network Discovery Service Decomposition
name: pomba-servicedecomposition
-version: 6.0.0
+version: 7.0.0
diff --git a/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml b/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml +++ b/kubernetes/pomba/components/pomba-servicedecomposition/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/components/pomba-validation-service/Chart.yaml b/kubernetes/pomba/components/pomba-validation-service/Chart.yaml index 525de440a9..d6c923ca69 100644 --- a/kubernetes/pomba/components/pomba-validation-service/Chart.yaml +++ b/kubernetes/pomba/components/pomba-validation-service/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: POMBA Validaton-Service name: pomba-validation-service -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/pomba/components/pomba-validation-service/requirements.yaml b/kubernetes/pomba/components/pomba-validation-service/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/pomba/components/pomba-validation-service/requirements.yaml +++ b/kubernetes/pomba/components/pomba-validation-service/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/pomba/requirements.yaml b/kubernetes/pomba/requirements.yaml index 69d5a458ad..99366de617 100644 --- a/kubernetes/pomba/requirements.yaml +++ b/kubernetes/pomba/requirements.yaml @@ -14,56 +14,56 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: pomba-aaictxbuilder - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-aaictxbuilder' condition: pomba-aaictxbuilder.enabled - name: pomba-contextaggregator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-contextaggregator' condition: pomba-contextaggregator.enabled - name: pomba-data-router - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-data-router' condition: pomba-data-router.enabled - name: pomba-elasticsearch - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-elasticsearch' condition: pomba-elasticsearch.enabled - name: pomba-kibana - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-kibana' condition: pomba-kibana.enabled - name: pomba-networkdiscovery - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-networkdiscovery' condition: pomba-networkdiscovery.enabled - name: pomba-networkdiscoveryctxbuilder - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-networkdiscoveryctxbuilder' condition: pomba-networkdiscoveryctxbuilder.enabled - name: pomba-sdcctxbuilder - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-sdcctxbuilder' condition: pomba-sdcctxbuilder.enabled - name: pomba-sdncctxbuilder - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-sdncctxbuilder' condition: pomba-sdncctxbuilder.enabled - name: pomba-search-data - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-search-data' condition: pomba-search-data.enabled - name: pomba-servicedecomposition - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-servicedecomposition' condition: pomba-servicedecomposition.enabled - name: pomba-validation-service - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/pomba-validation-service' condition: pomba-validation-service.enabled
\ No newline at end of file diff --git a/kubernetes/portal/Chart.yaml b/kubernetes/portal/Chart.yaml index 821685379d..e040c142c4 100644 --- a/kubernetes/portal/Chart.yaml +++ b/kubernetes/portal/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Web Portal name: portal -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/portal/components/portal-app/Chart.yaml b/kubernetes/portal/components/portal-app/Chart.yaml index 2815bf6c21..5c1b9a0dd5 100644 --- a/kubernetes/portal/components/portal-app/Chart.yaml +++ b/kubernetes/portal/components/portal-app/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Portal application name: portal-app -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/portal/components/portal-app/requirements.yaml b/kubernetes/portal/components/portal-app/requirements.yaml index bfcaecb7aa..5b9c746663 100644 --- a/kubernetes/portal/components/portal-app/requirements.yaml +++ b/kubernetes/portal/components/portal-app/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/portal/components/portal-cassandra/Chart.yaml b/kubernetes/portal/components/portal-cassandra/Chart.yaml index 48d419910b..f2f257739e 100644 --- a/kubernetes/portal/components/portal-cassandra/Chart.yaml +++ b/kubernetes/portal/components/portal-cassandra/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: Portal cassandra name: portal-cassandra -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/portal/components/portal-cassandra/requirements.yaml b/kubernetes/portal/components/portal-cassandra/requirements.yaml index 7c92350367..21436f4a17 100644 --- a/kubernetes/portal/components/portal-cassandra/requirements.yaml +++ b/kubernetes/portal/components/portal-cassandra/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/portal/components/portal-mariadb/Chart.yaml b/kubernetes/portal/components/portal-mariadb/Chart.yaml index 697acd791c..64ffc37f8d 100644 --- a/kubernetes/portal/components/portal-mariadb/Chart.yaml +++ b/kubernetes/portal/components/portal-mariadb/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: MariaDB Service name: portal-mariadb -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/portal/components/portal-mariadb/requirements.yaml b/kubernetes/portal/components/portal-mariadb/requirements.yaml index 7c92350367..21436f4a17 100644 --- a/kubernetes/portal/components/portal-mariadb/requirements.yaml +++ b/kubernetes/portal/components/portal-mariadb/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/portal/components/portal-sdk/Chart.yaml b/kubernetes/portal/components/portal-sdk/Chart.yaml index 766cc10f1b..485157c784 100644 --- a/kubernetes/portal/components/portal-sdk/Chart.yaml +++ b/kubernetes/portal/components/portal-sdk/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: Portal software development kit name: portal-sdk -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/portal/components/portal-sdk/requirements.yaml b/kubernetes/portal/components/portal-sdk/requirements.yaml index bfcaecb7aa..5b9c746663 100644 --- a/kubernetes/portal/components/portal-sdk/requirements.yaml +++ b/kubernetes/portal/components/portal-sdk/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/portal/components/portal-widget/Chart.yaml b/kubernetes/portal/components/portal-widget/Chart.yaml index 25c2dfd201..7b7af72095 100644 --- a/kubernetes/portal/components/portal-widget/Chart.yaml +++ b/kubernetes/portal/components/portal-widget/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: Portal widgets micro service application name: portal-widget -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/portal/components/portal-widget/requirements.yaml b/kubernetes/portal/components/portal-widget/requirements.yaml index 7c92350367..21436f4a17 100644 --- a/kubernetes/portal/components/portal-widget/requirements.yaml +++ b/kubernetes/portal/components/portal-widget/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/portal/requirements.yaml b/kubernetes/portal/requirements.yaml index 969a326ba5..ce8bdff3eb 100644 --- a/kubernetes/portal/requirements.yaml +++ b/kubernetes/portal/requirements.yaml @@ -15,20 +15,20 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: portal-app - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/portal-app' - name: portal-cassandra - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/portal-cassandra' - name: portal-mariadb - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/portal-mariadb' - name: portal-sdk - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/portal-sdk' - name: portal-widget - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/portal-widget' diff --git a/kubernetes/robot b/kubernetes/robot -Subproject 37ac984e35503182f7fc1b771cefa16bf0c8420 +Subproject 85b5af5058bbda19b557add185d917f60c2188e diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml index 95238c1a21..50779f8dda 100644 --- a/kubernetes/sdc/Chart.yaml +++ b/kubernetes/sdc/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: Service Design and Creation Umbrella Helm charts name: sdc -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdc/components/sdc-be/Chart.yaml b/kubernetes/sdc/components/sdc-be/Chart.yaml index 3189bebf01..d670f1c447 100644 --- a/kubernetes/sdc/components/sdc-be/Chart.yaml +++ b/kubernetes/sdc/components/sdc-be/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Service Design and Creation Backend API name: sdc-be -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdc/components/sdc-be/requirements.yaml b/kubernetes/sdc/components/sdc-be/requirements.yaml index 4bbe175a80..38e4a370f0 100644 --- a/kubernetes/sdc/components/sdc-be/requirements.yaml +++ b/kubernetes/sdc/components/sdc-be/requirements.yaml @@ -19,8 +19,8 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdc/components/sdc-cs/Chart.yaml b/kubernetes/sdc/components/sdc-cs/Chart.yaml index 973ca4512e..a35ac2555d 100644 --- a/kubernetes/sdc/components/sdc-cs/Chart.yaml +++ b/kubernetes/sdc/components/sdc-cs/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Service Design and Creation Cassandra name: sdc-cs -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdc/components/sdc-cs/requirements.yaml b/kubernetes/sdc/components/sdc-cs/requirements.yaml index a37208c8b7..50d12d8731 100644 --- a/kubernetes/sdc/components/sdc-cs/requirements.yaml +++ b/kubernetes/sdc/components/sdc-cs/requirements.yaml @@ -19,8 +19,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdc/components/sdc-fe/Chart.yaml b/kubernetes/sdc/components/sdc-fe/Chart.yaml index 4794092b6c..6e67e0435d 100644 --- a/kubernetes/sdc/components/sdc-fe/Chart.yaml +++ b/kubernetes/sdc/components/sdc-fe/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Service Design and Creation Front End name: sdc-fe -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdc/components/sdc-fe/requirements.yaml b/kubernetes/sdc/components/sdc-fe/requirements.yaml index 4bbe175a80..38e4a370f0 100644 --- a/kubernetes/sdc/components/sdc-fe/requirements.yaml +++ b/kubernetes/sdc/components/sdc-fe/requirements.yaml @@ -19,8 +19,8 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml index dadcc730d0..b14c1f3700 100644 --- a/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml +++ b/kubernetes/sdc/components/sdc-onboarding-be/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 description: ONAP Service Design and Creation Onboarding API name: sdc-onboarding-be -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml index 5b3c7a6575..e17ca1ce26 100644 --- a/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml +++ b/kubernetes/sdc/components/sdc-onboarding-be/requirements.yaml @@ -19,8 +19,8 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml index 7201db2fee..35160c1439 100644 --- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml +++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Service Design and Creation Workflow Designer backend name: sdc-wfd-be -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml index 4bbe175a80..38e4a370f0 100644 --- a/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml +++ b/kubernetes/sdc/components/sdc-wfd-be/requirements.yaml @@ -19,8 +19,8 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml index d5ef0a4db7..9cf5231b3c 100644 --- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml +++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Service Design and Creation Workflow Designer frontend name: sdc-wfd-fe -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml index 4bbe175a80..38e4a370f0 100644 --- a/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml +++ b/kubernetes/sdc/components/sdc-wfd-fe/requirements.yaml @@ -19,8 +19,8 @@ dependencies: - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdc/requirements.yaml b/kubernetes/sdc/requirements.yaml index 1b7cd0ebb1..aac3d46c2a 100644 --- a/kubernetes/sdc/requirements.yaml +++ b/kubernetes/sdc/requirements.yaml @@ -15,22 +15,22 @@ dependencies: - name: sdc-be - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdc-be' - name: sdc-cs - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdc-cs' - name: sdc-fe - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdc-fe' - name: sdc-onboarding-be - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdc-onboarding-be' - name: sdc-wfd-be - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdc-wfd-be' condition: sdc-wfd.enabled - name: sdc-wfd-fe - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdc-wfd-fe' condition: sdc-wfd.enabled
\ No newline at end of file diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml index 895595a952..a55d8bbd49 100644 --- a/kubernetes/sdnc/Chart.yaml +++ b/kubernetes/sdnc/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDN Controller name: sdnc -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml index 1ff1b22a11..0cb6c35fcd 100644 --- a/kubernetes/sdnc/components/dmaap-listener/Chart.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDNC DMaaP Listener name: dmaap-listener -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml index f99477141f..39a7aa565e 100644 --- a/kubernetes/sdnc/components/dmaap-listener/requirements.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/requirements.yaml @@ -14,5 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml index e3dfa869ee..fd45eae0d1 100644 --- a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: name: config-input - mountPath: /config name: properties - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config @@ -65,14 +65,14 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - command: - /opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: PROPERTY_DIR diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml index 0f3f18b6b2..27876cb47b 100644 --- a/kubernetes/sdnc/components/dmaap-listener/values.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml @@ -17,11 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - # envsusbt - envsubstImage: dibi/envsubst mariadbGalera: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists @@ -54,7 +49,6 @@ secrets: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/sdnc-dmaap-listener-image:2.0.4 pullPolicy: Always diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml index a8408165bf..28847aad65 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDN-C Ansible Server name: sdnc-ansible-server -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml index 6a61926e9e..5422be8870 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/requirements.yaml @@ -14,5 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml index d6d05efbdd..41a5c09a10 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: name: config-input - mountPath: /config name: config - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config @@ -61,7 +61,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: @@ -69,7 +69,7 @@ spec: command: ["/bin/bash"] args: ["-c", "cd /opt/onap/ccsdk && ./startAnsibleServer.sh"] - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml index 080ae9c15f..858ff71d31 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml @@ -17,11 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - # envsusbt - envsubstImage: dibi/envsubst mariadbGalera: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists @@ -54,7 +49,6 @@ secrets: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/sdnc-ansible-server-image:2.0.4 pullPolicy: Always diff --git a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml index 54fb337f04..7719ab86b2 100644 --- a/kubernetes/sdnc/components/sdnc-prom/Chart.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP SDNC Policy Driven Ownership Management name: sdnc-prom -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml index e4c7240290..088d219ce1 100644 --- a/kubernetes/sdnc/components/sdnc-prom/requirements.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/requirements.yaml @@ -14,5 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml index 1853ab937e..1c9adad5a0 100644 --- a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml @@ -40,12 +40,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} envFrom: - configMapRef: diff --git a/kubernetes/sdnc/components/sdnc-prom/values.yaml b/kubernetes/sdnc/components/sdnc-prom/values.yaml index 9551bc4ffd..d9afd1aab0 100644 --- a/kubernetes/sdnc/components/sdnc-prom/values.yaml +++ b/kubernetes/sdnc/components/sdnc-prom/values.yaml @@ -17,10 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - repository: nexus3.onap.org:10001 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 persistence: mountPath: /dockerdata-nfs @@ -28,7 +24,6 @@ global: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 pullPolicy: Always image: onap/music/prom:1.0.5 diff --git a/kubernetes/sdnc/components/sdnc-web/Chart.yaml b/kubernetes/sdnc/components/sdnc-web/Chart.yaml index 869f7fc428..fbdfaa170b 100644 --- a/kubernetes/sdnc/components/sdnc-web/Chart.yaml +++ b/kubernetes/sdnc/components/sdnc-web/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDN-C Web Server name: sdnc-web -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sdnc/components/sdnc-web/requirements.yaml b/kubernetes/sdnc/components/sdnc-web/requirements.yaml index dcb280d037..013213436e 100644 --- a/kubernetes/sdnc/components/sdnc-web/requirements.yaml +++ b/kubernetes/sdnc/components/sdnc-web/requirements.yaml @@ -15,8 +15,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml index acaf1ae900..a2e3a48e25 100644 --- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: spec: initContainers: {{ include "common.certInitializer.initContainer" . | indent 6 }} - name: {{ include "common.name" . }}-readiness - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - /app/ready.py @@ -41,7 +41,7 @@ spec: containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: {{- include "common.containerPorts" . | indent 10 }} # disable liveness probe when breakpoints set in debugger diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml index 136379a7a2..f040736794 100644 --- a/kubernetes/sdnc/components/sdnc-web/values.yaml +++ b/kubernetes/sdnc/components/sdnc-web/values.yaml @@ -18,15 +18,11 @@ global: aafEnabled: true nodePortPrefix: 322 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 k8scluster: svc.cluster.local ################################################################# # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: "onap/sdnc-web-image:2.0.4" pullPolicy: Always diff --git a/kubernetes/sdnc/components/ueb-listener/Chart.yaml b/kubernetes/sdnc/components/ueb-listener/Chart.yaml index 3195ab670d..4183a86299 100644 --- a/kubernetes/sdnc/components/ueb-listener/Chart.yaml +++ b/kubernetes/sdnc/components/ueb-listener/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDNC UEB Listener name: ueb-listener -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/sdnc/components/ueb-listener/requirements.yaml b/kubernetes/sdnc/components/ueb-listener/requirements.yaml index f99477141f..39a7aa565e 100644 --- a/kubernetes/sdnc/components/ueb-listener/requirements.yaml +++ b/kubernetes/sdnc/components/ueb-listener/requirements.yaml @@ -14,5 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 + repository: '@local' + - name: repositoryGenerator + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml index 63a1f8ac18..385fd9b651 100644 --- a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml +++ b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml @@ -50,7 +50,7 @@ spec: name: config-input - mountPath: /config name: properties - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config - command: @@ -70,14 +70,14 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - command: - /opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: PROPERTY_DIR diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml index 2b0da14424..6de8947d77 100644 --- a/kubernetes/sdnc/components/ueb-listener/values.yaml +++ b/kubernetes/sdnc/components/ueb-listener/values.yaml @@ -17,11 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 - # envsusbt - envsubstImage: dibi/envsubst mariadbGalera: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists @@ -60,7 +55,6 @@ secrets: # Application configuration defaults. ################################################################# # application image -repository: nexus3.onap.org:10001 image: onap/sdnc-ueb-listener-image:2.0.4 pullPolicy: Always diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml index fd57517e32..2f2d7fb579 100644 --- a/kubernetes/sdnc/requirements.yaml +++ b/kubernetes/sdnc/requirements.yaml @@ -15,51 +15,53 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: logConfiguration - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: network-name-gen - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: network-name-gen.enabled - name: dgbuilder - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: dgbuilder.enabled - name: sdnc-prom - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: config.geoEnabled - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: .global.mariadbGalera.localCluster - name: elasticsearch - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: config.sdnr.enabled # conditions for sdnc-subcharts - name: dmaap-listener - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/dmaap-listener/' condition: sdnc.dmaap-listener.enabled,dmaap-listener.enabled - name: ueb-listener - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/ueb-listener/' condition: sdnc.ueb-listener.enabled,ueb-listener.enabled - name: sdnc-ansible-server - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdnc-ansible-server/' condition: sdnc.sdnc-ansible-server.enabled,sdnc-ansible-server.enabled - name: sdnc-web - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/sdnc-web/' condition: sdnc.sdnc-web.enabled,sdnc-web.enabled - + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml index e0f0e55252..897a0bac7e 100755 --- a/kubernetes/sdnc/templates/job.yaml +++ b/kubernetes/sdnc/templates/job.yaml @@ -76,7 +76,7 @@ spec: name: config-input - mountPath: /config name: properties - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config @@ -92,11 +92,11 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: MYSQL_ROOT_PASSWORD diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index 7975b70ed2..cb8d7574db 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -26,7 +26,7 @@ spec: {{ include "common.certInitializer.initContainer" . | indent 6 }} {{ if .Values.global.aafEnabled }} - name: {{ include "common.name" . }}-chown - image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }} + image: {{ include "repositoryGenerator.image.busybox" . }} command: ["sh", "-c", "chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }}"] volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }} {{ end }} @@ -46,11 +46,11 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} containers: - name: {{ include "common.name" . }}-sdnrdb-init-job - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/bash"] args: ["-c", "{{ .Values.config.binDir }}/startODL.sh"] diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 98ad43ed60..4fa6b70d70 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -72,7 +72,7 @@ spec: name: config-input - mountPath: /config name: properties - image: "{{ .Values.global.envsubstImage }}" + image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config {{ if .Values.dgbuilder.enabled -}} @@ -93,7 +93,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{ end -}} @@ -101,7 +101,7 @@ spec: {{ if .Values.global.cmpv2Enabled }} - name: certs-init - image: "{{ .Values.global.repository }}/{{ .Values.global.platform.certServiceClient.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.platform.certServiceClient.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: REQUEST_URL @@ -142,7 +142,7 @@ spec: {{ end }} - name: {{ include "common.name" . }}-chown - image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }} + image: {{ include "repositoryGenerator.image.busybox" . }} command: - sh args: @@ -157,7 +157,7 @@ spec: name: {{ include "common.fullname" . }}-data containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/bash"] args: ["-c", "/opt/onap/sdnc/bin/startODL.sh"] @@ -293,7 +293,7 @@ spec: # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index af5a6f4878..edac61b24e 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -19,15 +19,9 @@ global: nodePortPrefix: 302 nodePortPrefixExt: 304 - repository: nexus3.onap.org:10001 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 persistence: mountPath: /dockerdata-nfs aafEnabled: true - # envsusbt - envsubstImage: dibi/envsubst mariadbGalera: #This flag allows SO to instantiate its own mariadb-galera cluster #If shared instance is used, this chart assumes that DB already exists @@ -134,11 +128,8 @@ secrets: ################################################################# # application images -repository: nexus3.onap.org:10001 pullPolicy: Always image: onap/sdnc-image:2.0.4 -busyboxRepository: docker.io -busyboxImage: busybox:1.30 # flag to enable debugging - application support required debugEnabled: false diff --git a/kubernetes/sniro-emulator/Chart.yaml b/kubernetes/sniro-emulator/Chart.yaml index 604553a827..1b2b5cb698 100644 --- a/kubernetes/sniro-emulator/Chart.yaml +++ b/kubernetes/sniro-emulator/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Mock Sniro Emulator name: sniro-emulator -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/sniro-emulator/requirements.yaml b/kubernetes/sniro-emulator/requirements.yaml index a72069ff78..1e08aaf3cd 100644 --- a/kubernetes/sniro-emulator/requirements.yaml +++ b/kubernetes/sniro-emulator/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml index 4607f5ed82..867996a9a7 100755 --- a/kubernetes/so/Chart.yaml +++ b/kubernetes/so/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP Service Orchestrator name: so -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml index ab2bad332a..ee53cb4160 100644 --- a/kubernetes/so/components/so-appc-orchestrator/Chart.yaml +++ b/kubernetes/so/components/so-appc-orchestrator/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: A Helm chart for so appc orchestrator name: so-appc-orchestrator -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml index d25c12c663..e8367b2eb5 100755 --- a/kubernetes/so/components/so-appc-orchestrator/requirements.yaml +++ b/kubernetes/so/components/so-appc-orchestrator/requirements.yaml @@ -13,14 +13,14 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml index faba23eb16..0803e4f82a 100755 --- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml +++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for SO Bpmn Infra name: so-bpmn-infra -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/so-bpmn-infra/requirements.yaml b/kubernetes/so/components/so-bpmn-infra/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-bpmn-infra/requirements.yaml +++ b/kubernetes/so/components/so-bpmn-infra/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml index 8c5a846df9..0eaa20410e 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: A Helm chart for so-catalog-db-adapter name: so-catalog-db-adapter -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml index 4b507c105a..0211008c03 100755 --- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml +++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml @@ -16,5 +16,5 @@ apiVersion: v1 appVersion: "1.7.1" description: A Helm chart for Kubernetes name: so-cnf-adapter -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/so-cnf-adapter/requirements.yaml b/kubernetes/so/components/so-cnf-adapter/requirements.yaml index ecba826c68..3e953c0aa2 100755 --- a/kubernetes/so/components/so-cnf-adapter/requirements.yaml +++ b/kubernetes/so/components/so-cnf-adapter/requirements.yaml @@ -14,15 +14,15 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml index c4fb9a49d5..2db202a6dd 100644 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP SO ETSI NFVO NS LCM name: so-etsi-nfvo-ns-lcm -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml index d25c12c663..e8367b2eb5 100755 --- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml +++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/requirements.yaml @@ -13,14 +13,14 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-mariadb/Chart.yaml b/kubernetes/so/components/so-mariadb/Chart.yaml index 2c6f0278b0..e95507bd1b 100755 --- a/kubernetes/so/components/so-mariadb/Chart.yaml +++ b/kubernetes/so/components/so-mariadb/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: MariaDB Service name: so-mariadb -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-mariadb/requirements.yaml b/kubernetes/so/components/so-mariadb/requirements.yaml index 0dfef90cff..7760cd8f3b 100755 --- a/kubernetes/so/components/so-mariadb/requirements.yaml +++ b/kubernetes/so/components/so-mariadb/requirements.yaml @@ -13,14 +13,14 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/so/components/so-monitoring/Chart.yaml b/kubernetes/so/components/so-monitoring/Chart.yaml index ede67ab54f..44a24c3fad 100644 --- a/kubernetes/so/components/so-monitoring/Chart.yaml +++ b/kubernetes/so/components/so-monitoring/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v1 description: A Helm chart for ONAP Service Orchestration Monitoring name: so-monitoring -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-monitoring/requirements.yaml b/kubernetes/so/components/so-monitoring/requirements.yaml index b9be601082..1c45e43f63 100755 --- a/kubernetes/so/components/so-monitoring/requirements.yaml +++ b/kubernetes/so/components/so-monitoring/requirements.yaml @@ -14,14 +14,14 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml index b3311d1c8c..2469dc3ec2 100755 --- a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-nssmf-adapter -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-nssmf-adapter/requirements.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-oof-adapter/Chart.yaml b/kubernetes/so/components/so-oof-adapter/Chart.yaml index cce161a8cd..77e397e6ea 100755 --- a/kubernetes/so/components/so-oof-adapter/Chart.yaml +++ b/kubernetes/so/components/so-oof-adapter/Chart.yaml @@ -16,4 +16,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-oof-adapter -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/so-oof-adapter/requirements.yaml b/kubernetes/so/components/so-oof-adapter/requirements.yaml index 3398a2d39d..cc9892a50c 100644 --- a/kubernetes/so/components/so-oof-adapter/requirements.yaml +++ b/kubernetes/so/components/so-oof-adapter/requirements.yaml @@ -14,14 +14,14 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml index cf257d3239..aefbe81480 100755 --- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml +++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-openstack-adapter -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-openstack-adapter/requirements.yaml b/kubernetes/so/components/so-openstack-adapter/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-openstack-adapter/requirements.yaml +++ b/kubernetes/so/components/so-openstack-adapter/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml index 499a8950e6..f11df83d3c 100755 --- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml +++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: A Helm chart for request-db-adapter name: so-request-db-adapter -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-request-db-adapter/requirements.yaml b/kubernetes/so/components/so-request-db-adapter/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-request-db-adapter/requirements.yaml +++ b/kubernetes/so/components/so-request-db-adapter/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml index 6151e1beae..6d61343a08 100755 --- a/kubernetes/so/components/so-sdc-controller/Chart.yaml +++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-sdc-controller -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-sdc-controller/requirements.yaml b/kubernetes/so/components/so-sdc-controller/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-sdc-controller/requirements.yaml +++ b/kubernetes/so/components/so-sdc-controller/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml index 1ab7a2b0b4..c8eb365615 100755 --- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-sdnc-adapter -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml index d25c12c663..e8367b2eb5 100755 --- a/kubernetes/so/components/so-sdnc-adapter/requirements.yaml +++ b/kubernetes/so/components/so-sdnc-adapter/requirements.yaml @@ -13,14 +13,14 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml index b78051ff14..2957573b59 100755 --- a/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml +++ b/kubernetes/so/components/so-ve-vnfm-adapter/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP SO VE VNFM Adapter (SOL002) name: so-ve-vnfm-adapter -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml +++ b/kubernetes/so/components/so-ve-vnfm-adapter/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-vfc-adapter/Chart.yaml b/kubernetes/so/components/so-vfc-adapter/Chart.yaml index 2ce175d9c1..d8e1dab65c 100755 --- a/kubernetes/so/components/so-vfc-adapter/Chart.yaml +++ b/kubernetes/so/components/so-vfc-adapter/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 appVersion: "1.0" description: A Helm chart for Kubernetes name: so-vfc-adapter -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/so/components/so-vfc-adapter/requirements.yaml b/kubernetes/so/components/so-vfc-adapter/requirements.yaml index 82296bee1d..9a5ba74887 100755 --- a/kubernetes/so/components/so-vfc-adapter/requirements.yaml +++ b/kubernetes/so/components/so-vfc-adapter/requirements.yaml @@ -13,17 +13,17 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/so-vnfm-adapter/Chart.yaml b/kubernetes/so/components/so-vnfm-adapter/Chart.yaml index 3ef796acd7..627b4d3c9a 100755 --- a/kubernetes/so/components/so-vnfm-adapter/Chart.yaml +++ b/kubernetes/so/components/so-vnfm-adapter/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: ONAP SO VNFM Adapter name: so-vnfm-adapter -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml b/kubernetes/so/components/so-vnfm-adapter/requirements.yaml index d25c12c663..e8367b2eb5 100755 --- a/kubernetes/so/components/so-vnfm-adapter/requirements.yaml +++ b/kubernetes/so/components/so-vnfm-adapter/requirements.yaml @@ -13,14 +13,14 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://../soHelpers' diff --git a/kubernetes/so/components/soHelpers/Chart.yaml b/kubernetes/so/components/soHelpers/Chart.yaml index a91111a33a..5690c31680 100755 --- a/kubernetes/so/components/soHelpers/Chart.yaml +++ b/kubernetes/so/components/soHelpers/Chart.yaml @@ -14,4 +14,4 @@ apiVersion: v1 description: A Helm chart for SO helpers name: soHelpers -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/so/components/soHelpers/requirements.yaml b/kubernetes/so/components/soHelpers/requirements.yaml index aa972a525b..c7257e1155 100755 --- a/kubernetes/so/components/soHelpers/requirements.yaml +++ b/kubernetes/so/components/soHelpers/requirements.yaml @@ -13,11 +13,11 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: certInitializer - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/so/requirements.yaml b/kubernetes/so/requirements.yaml index 2b60a69589..c61f522b31 100755 --- a/kubernetes/so/requirements.yaml +++ b/kubernetes/so/requirements.yaml @@ -13,81 +13,81 @@ # limitations under the License. dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: readinessCheck - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: global.mariadbGalera.localCluster - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: soHelpers - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/soHelpers' - name: so-appc-orchestrator - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-appc-orchestrator' condition: so-appc-orchestrator.enabled - name: so-bpmn-infra - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-bpmn-infra' - name: so-catalog-db-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-catalog-db-adapter' condition: so-catalog-db-adapter.enabled - name: so-cnf-adapter - version: ~6.x-0 + version: ~7.x-0 repository: "file://components/so-cnf-adapter" condition: so-cnf-adapter.enabled - name: so-etsi-nfvo-ns-lcm - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-etsi-nfvo-ns-lcm' condition: so-etsi-nfvo-ns-lcm.enabled - name: so-mariadb - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-mariadb' - name: so-monitoring - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-monitoring' condition: so-monitoring.enabled - name: so-nssmf-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-nssmf-adapter' condition: so-nssmf-adapter.enabled - name: so-oof-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-oof-adapter' condition: so-oof-adapter.enabled - name: so-openstack-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-openstack-adapter' condition: so-openstack-adapter.enabled - name: so-request-db-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-request-db-adapter' - name: so-sdc-controller - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-sdc-controller' - name: so-sdnc-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-sdnc-adapter' condition: so-sdnc-adapter.enabled - name: so-ve-vnfm-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-ve-vnfm-adapter' condition: so-ve-vnfm-adapter.enabled - name: so-vfc-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-vfc-adapter' condition: so-vfc-adapter.enabled - name: so-vnfm-adapter - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/so-vnfm-adapter' condition: so-vnfm-adapter.enabled diff --git a/kubernetes/uui/Chart.yaml b/kubernetes/uui/Chart.yaml index c58eb8e291..4e56a02ba2 100644 --- a/kubernetes/uui/Chart.yaml +++ b/kubernetes/uui/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP uui name: uui -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/uui/charts/uui-server/Chart.yaml b/kubernetes/uui/charts/uui-server/Chart.yaml index 957d9ce59a..5b424b6d6a 100644 --- a/kubernetes/uui/charts/uui-server/Chart.yaml +++ b/kubernetes/uui/charts/uui-server/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP uui server name: uui-server -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/uui/requirements.yaml b/kubernetes/uui/requirements.yaml index 8f74b745d3..26e63fedef 100644 --- a/kubernetes/uui/requirements.yaml +++ b/kubernetes/uui/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/vfc/Chart.yaml b/kubernetes/vfc/Chart.yaml index 52994a720a..0aa0060cfd 100644 --- a/kubernetes/vfc/Chart.yaml +++ b/kubernetes/vfc/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Virtual Function Controller (VF-C) name: vfc -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml index 42e4691899..6ecd35b200 100644 --- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml +++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - Generic VNFM Driver name: vfc-generic-vnfm-driver -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml +++ b/kubernetes/vfc/components/vfc-generic-vnfm-driver/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml index 6f5734f8f8..a162e7a6e8 100644 --- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml +++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - Huawei VNFM Driver name: vfc-huawei-vnfm-driver -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml +++ b/kubernetes/vfc/components/vfc-huawei-vnfm-driver/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml index a58118f3df..bd3bae7194 100644 --- a/kubernetes/vfc/components/vfc-nslcm/Chart.yaml +++ b/kubernetes/vfc/components/vfc-nslcm/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - NS Life Cycle Management name: vfc-nslcm -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-nslcm/requirements.yaml +++ b/kubernetes/vfc/components/vfc-nslcm/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/components/vfc-redis/Chart.yaml b/kubernetes/vfc/components/vfc-redis/Chart.yaml index ede374f88b..1655a93ad6 100644 --- a/kubernetes/vfc/components/vfc-redis/Chart.yaml +++ b/kubernetes/vfc/components/vfc-redis/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - REDIS name: vfc-redis -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/vfc/components/vfc-redis/requirements.yaml b/kubernetes/vfc/components/vfc-redis/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-redis/requirements.yaml +++ b/kubernetes/vfc/components/vfc-redis/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml index 5bde32a97c..ad5cd005e7 100644 --- a/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml +++ b/kubernetes/vfc/components/vfc-vnflcm/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - VNF Life Cycle Management name: vfc-vnflcm -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml +++ b/kubernetes/vfc/components/vfc-vnflcm/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml index 938ea5d4f1..e56225cc3a 100644 --- a/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml +++ b/kubernetes/vfc/components/vfc-vnfmgr/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - VNF Manager name: vfc-vnfmgr -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml +++ b/kubernetes/vfc/components/vfc-vnfmgr/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml index 3002bce3e8..5eceede99a 100644 --- a/kubernetes/vfc/components/vfc-vnfres/Chart.yaml +++ b/kubernetes/vfc/components/vfc-vnfres/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - VNF Resource Manager name: vfc-vnfres -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-vnfres/requirements.yaml +++ b/kubernetes/vfc/components/vfc-vnfres/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml index d8cd37921e..aff7c02c16 100644 --- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml +++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VFC - ZTE VNFM Driver name: vfc-zte-vnfm-driver -version: 6.0.0
\ No newline at end of file +version: 7.0.0
\ No newline at end of file diff --git a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml index fbe51550f0..39a7aa565e 100644 --- a/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml +++ b/kubernetes/vfc/components/vfc-zte-vnfm-driver/requirements.yaml @@ -14,8 +14,8 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' diff --git a/kubernetes/vfc/requirements.yaml b/kubernetes/vfc/requirements.yaml index 1ac82cbecb..962fc90d63 100644 --- a/kubernetes/vfc/requirements.yaml +++ b/kubernetes/vfc/requirements.yaml @@ -14,43 +14,43 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: vfc-generic-vnfm-driver - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-generic-vnfm-driver' condition: vfc-generic-vnfm-driver.enabled - name: vfc-huawei-vnfm-driver - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-huawei-vnfm-driver' condition: vfc-huawei-vnfm-driver.enabled - name: vfc-nslcm - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-nslcm' condition: vfc-nslcm.enabled - name: vfc-redis - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-redis' condition: vfc-redis.enabled - name: vfc-vnflcm - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-vnflcm' condition: vfc-vnflcm.enabled - name: vfc-vnfmgr - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-vnfmgr' condition: vfc-vnfmgr.enabled - name: vfc-vnfres - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-vnfres' condition: vfc-vnfres.enabled - name: vfc-zte-vnfm-driver - version: ~6.x-0 + version: ~7.x-0 repository: 'file://components/vfc-zte-vnfm-driver' condition: vfc-zte-vnfm-driver.enabled diff --git a/kubernetes/vid/Chart.yaml b/kubernetes/vid/Chart.yaml index fa284c702b..5ad5733065 100644 --- a/kubernetes/vid/Chart.yaml +++ b/kubernetes/vid/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP Virtual Infrastructure Deployment name: vid -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/vid/requirements.yaml b/kubernetes/vid/requirements.yaml index ed8b8057d9..c6554cada2 100644 --- a/kubernetes/vid/requirements.yaml +++ b/kubernetes/vid/requirements.yaml @@ -14,17 +14,20 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 # local reference to common chart, as it is # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' - name: mariadb-galera - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: global.mariadbGalera.localCluster - name: mariadb-init - version: ~6.x-0 + version: ~7.x-0 repository: '@local' condition: not global.mariadbGalera.localCluster + - name: repositoryGenerator + version: ~7.x-0 + repository: '@local' diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml index 41b0019cbe..856a853960 100644 --- a/kubernetes/vid/templates/deployment.yaml +++ b/kubernetes/vid/templates/deployment.yaml @@ -48,12 +48,12 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" + image: {{ include "repositoryGenerator.image.readiness" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -139,7 +139,7 @@ spec: {{- end }} # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index 93de57e4b3..47cd73aff2 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -18,9 +18,6 @@ # Declare variables to be passed into your templates. global: nodePortPrefix: 302 - readinessImage: onap/oom/readiness:3.0.1 - loggingRepository: docker.elastic.co - loggingImage: beats/filebeat:5.5.0 mariadbGalera: &mariadbGalera #This flag allows VID to instantiate its own mariadb-galera cluster localCluster: false @@ -43,7 +40,6 @@ subChartsOnly: enabled: true # application image -repository: nexus3.onap.org:10001 image: onap/vid:7.0.0 pullPolicy: Always @@ -70,8 +66,8 @@ config: roleaccesscentralized: remote mariadb-galera: - # '&mariadbConfig' means we "store" the values for later use in the file - # with '*mariadbConfig' pointer. + # '&mariadbConfig' means we "store" the values for later use in the file + # with '*mariadbConfig' pointer. config: &mariadbConfig userCredentialsExternalSecret: '{{ include "common.release" . }}-vid-db-user-secret' mysqlDatabase: vid_openecomp_epsdk @@ -127,11 +123,11 @@ service: ingress: enabled: false service: - - baseaddr: "vid.api" - name: "vid-http" - port: 8443 + - baseaddr: "vid.api" + name: "vid-http" + port: 8443 config: - ssl: "redirect" + ssl: "redirect" # Resource Limit flavor -By Default using small flavor: small diff --git a/kubernetes/vnfsdk/Chart.yaml b/kubernetes/vnfsdk/Chart.yaml index 74190104cd..ae826e8ea9 100644 --- a/kubernetes/vnfsdk/Chart.yaml +++ b/kubernetes/vnfsdk/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP VNF SDK name: vnfsdk -version: 6.0.0 +version: 7.0.0 diff --git a/kubernetes/vnfsdk/requirements.yaml b/kubernetes/vnfsdk/requirements.yaml index 1b01fddcd9..b6683593fd 100644 --- a/kubernetes/vnfsdk/requirements.yaml +++ b/kubernetes/vnfsdk/requirements.yaml @@ -14,11 +14,11 @@ dependencies: - name: common - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: postgres - version: ~6.x-0 + version: ~7.x-0 repository: '@local' - name: repositoryGenerator - version: ~6.x-0 + version: ~7.x-0 repository: '@local' |