diff options
| -rw-r--r-- | components/aai-graphadmin/templates/deployment.yaml | 11 | ||||
| -rw-r--r-- | components/aai-graphadmin/templates/job-copy-db-backup.yaml | 7 | ||||
| -rw-r--r-- | components/aai-graphadmin/templates/job-create-db.yaml | 9 | ||||
| -rw-r--r-- | components/aai-graphadmin/templates/job-migration.yaml | 11 | ||||
| -rw-r--r-- | components/aai-graphadmin/values.yaml | 6 | ||||
| -rw-r--r-- | components/aai-resources/templates/deployment.yaml | 13 | ||||
| -rw-r--r-- | components/aai-resources/values.yaml | 6 | ||||
| -rw-r--r-- | components/aai-sparky-be/templates/deployment.yaml | 9 | ||||
| -rw-r--r-- | components/aai-sparky-be/values.yaml | 6 | ||||
| -rw-r--r-- | components/aai-traversal/templates/deployment.yaml | 13 | ||||
| -rw-r--r-- | components/aai-traversal/templates/job.yaml | 9 | ||||
| -rw-r--r-- | components/aai-traversal/values.yaml | 6 | ||||
| -rw-r--r-- | templates/deployment.yaml | 7 | ||||
| -rw-r--r-- | values.yaml | 8 |
14 files changed, 65 insertions, 56 deletions
diff --git a/components/aai-graphadmin/templates/deployment.yaml b/components/aai-graphadmin/templates/deployment.yaml index bee6b75..a43e984 100644 --- a/components/aai-graphadmin/templates/deployment.yaml +++ b/components/aai-graphadmin/templates/deployment.yaml @@ -2,7 +2,8 @@ # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2020 Nokia Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -45,17 +46,17 @@ spec: initContainers: - command: {{ if .Values.global.jobs.migration.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-migration {{ else if .Values.global.jobs.createSchema.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-create-db-schema {{ else }} - - /root/ready.py + - /app/ready.py args: - --container-name {{- if .Values.global.cassandra.localCluster }} @@ -72,7 +73,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{ end }} diff --git a/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/components/aai-graphadmin/templates/job-copy-db-backup.yaml index 36c0538..3111d0c 100644 --- a/components/aai-graphadmin/templates/job-copy-db-backup.yaml +++ b/components/aai-graphadmin/templates/job-copy-db-backup.yaml @@ -2,7 +2,8 @@ # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2020 Nokia Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -59,14 +60,14 @@ spec: - command: - /bin/bash - -c - - /root/ready.py --container-name aai-cassandra --timeout 1 || /root/ready.py --container-name cassandra + - /app/ready.py --container-name aai-cassandra --timeout 1 || /app/ready.py --container-name cassandra env: - name: NAMESPACE valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-db-backup-readiness {{- end }} diff --git a/components/aai-graphadmin/templates/job-create-db.yaml b/components/aai-graphadmin/templates/job-create-db.yaml index 2546c0a..fe3e6e8 100644 --- a/components/aai-graphadmin/templates/job-create-db.yaml +++ b/components/aai-graphadmin/templates/job-create-db.yaml @@ -2,7 +2,8 @@ # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2020 Nokia Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -51,7 +52,7 @@ spec: spec: initContainers: - command: - - /root/ready.py + - /app/ready.py args: - --container-name {{- if .Values.global.cassandra.localCluster }} @@ -67,7 +68,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: @@ -146,4 +147,4 @@ spec: restartPolicy: Never imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" -{{ end }}
\ No newline at end of file +{{ end }} diff --git a/components/aai-graphadmin/templates/job-migration.yaml b/components/aai-graphadmin/templates/job-migration.yaml index 7e62fb9..f95557d 100644 --- a/components/aai-graphadmin/templates/job-migration.yaml +++ b/components/aai-graphadmin/templates/job-migration.yaml @@ -2,7 +2,8 @@ # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2020 Nokia Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -56,7 +57,7 @@ spec: spec: initContainers: - command: - - /root/ready.py + - /app/ready.py args: - --container-name {{- if .Values.global.cassandra.localCluster }} @@ -72,7 +73,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness - command: @@ -227,14 +228,14 @@ spec: - command: - /bin/bash - -c - - /root/ready.py --container-name aai-cassandra --timeout 1 || /root/ready.py --container-name cassandra + - /app/ready.py --container-name aai-cassandra --timeout 1 || /app/ready.py --container-name cassandra env: - name: NAMESPACE valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-db-backup-readiness {{- end }} diff --git a/components/aai-graphadmin/values.yaml b/components/aai-graphadmin/values.yaml index 2527cea..b5519d2 100644 --- a/components/aai-graphadmin/values.yaml +++ b/components/aai-graphadmin/values.yaml @@ -2,7 +2,8 @@ # ============LICENSE_START======================================================= # org.onap.aai # ================================================================================ -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2020 Nokia Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,8 +23,7 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - legacyReadinessRepository: oomk8s - legacyReadinessImage: readiness-check:2.2.2 + readinessImage: onap/oom/readiness:3.0.1 # application image diff --git a/components/aai-resources/templates/deployment.yaml b/components/aai-resources/templates/deployment.yaml index c43c4ec..2440da6 100644 --- a/components/aai-resources/templates/deployment.yaml +++ b/components/aai-resources/templates/deployment.yaml @@ -1,5 +1,6 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 AT&T +# Copyright (c) 2017 Amdocs, Bell Canada +# Modifications Copyright (c) 2018 AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -1184,17 +1185,17 @@ spec: initContainers: - command: {{ if .Values.global.jobs.migration.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-migration {{ else if .Values.global.jobs.createSchema.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-create-db-schema {{ else }} - - /root/ready.py + - /app/ready.py args: - --container-name {{- if .Values.global.cassandra.localCluster }} @@ -1211,7 +1212,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{ if .Values.global.installSidecarSecurity }} diff --git a/components/aai-resources/values.yaml b/components/aai-resources/values.yaml index b71c9c4..fc50f20 100644 --- a/components/aai-resources/values.yaml +++ b/components/aai-resources/values.yaml @@ -1,4 +1,5 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T +# Copyright (c) 2018 Amdocs, Bell Canada, AT&T +# Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,8 +18,7 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - legacyReadinessRepository: oomk8s - legacyReadinessImage: readiness-check:2.2.2 + readinessImage: onap/oom/readiness:3.0.1 # application image repository: nexus3.onap.org:10001 diff --git a/components/aai-sparky-be/templates/deployment.yaml b/components/aai-sparky-be/templates/deployment.yaml index b0bc74e..a4fe4e2 100644 --- a/components/aai-sparky-be/templates/deployment.yaml +++ b/components/aai-sparky-be/templates/deployment.yaml @@ -1,5 +1,6 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 AT&T +# Copyright (c) 2017 Amdocs, Bell Canada +# Modifications Copyright (c) 2018 AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -37,7 +38,7 @@ spec: spec: initContainers: - command: - - /root/ready.py + - /app/ready.py args: - --container-name - aai-elasticsearch @@ -51,7 +52,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: diff --git a/components/aai-sparky-be/values.yaml b/components/aai-sparky-be/values.yaml index 643eee7..becf402 100644 --- a/components/aai-sparky-be/values.yaml +++ b/components/aai-sparky-be/values.yaml @@ -1,4 +1,5 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T +# Copyright (c) 2018 Amdocs, Bell Canada, AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,8 +26,7 @@ global: # global defaults serviceName: aai-gizmo searchData: serviceName: aai-search-data - legacyReadinessRepository: oomk8s - legacyReadinessImage: readiness-check:2.2.2 + readinessImage: onap/oom/readiness:3.0.1 # application image repository: nexus3.onap.org:10001 diff --git a/components/aai-traversal/templates/deployment.yaml b/components/aai-traversal/templates/deployment.yaml index b1b779e..a864ea9 100644 --- a/components/aai-traversal/templates/deployment.yaml +++ b/components/aai-traversal/templates/deployment.yaml @@ -1,5 +1,6 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 AT&T +# Copyright (c) 2017 Amdocs, Bell Canada +# Modifications Copyright (c) 2018 AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -630,17 +631,17 @@ spec: initContainers: - command: {{ if .Values.global.jobs.migration.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-migration {{ else if .Values.global.jobs.createSchema.enabled }} - - /root/job_complete.py + - /app/ready.py args: - --job-name - {{ include "common.release" . }}-aai-graphadmin-create-db-schema {{ else }} - - /root/ready.py + - /app/ready.py args: - --container-name {{- if .Values.global.cassandra.localCluster }} @@ -657,7 +658,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness {{ end }} diff --git a/components/aai-traversal/templates/job.yaml b/components/aai-traversal/templates/job.yaml index 6f5e259..b92830f 100644 --- a/components/aai-traversal/templates/job.yaml +++ b/components/aai-traversal/templates/job.yaml @@ -1,5 +1,6 @@ -# Copyright © 2017-2018 AT&T -# Modifications Copyright © 2018 Amdocs, Bell Canada +# Copyright (c) 2017-2018 AT&T +# Modifications Copyright (c) 2018 Amdocs, Bell Canada +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -41,7 +42,7 @@ spec: spec: initContainers: - command: - - /root/ready.py + - /app/ready.py args: - --container-name - aai @@ -55,7 +56,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: diff --git a/components/aai-traversal/values.yaml b/components/aai-traversal/values.yaml index 04185ee..75fd854 100644 --- a/components/aai-traversal/values.yaml +++ b/components/aai-traversal/values.yaml @@ -1,4 +1,5 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T +# Copyright (c) 2018 Amdocs, Bell Canada, AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,8 +18,7 @@ # Declare variables to be passed into your templates. global: # global defaults nodePortPrefix: 302 - legacyReadinessRepository: oomk8s - legacyReadinessImage: readiness-check:2.2.2 + readinessImage: onap/oom/readiness:3.0.1 # application image diff --git a/templates/deployment.yaml b/templates/deployment.yaml index e04b5fd..a28d833 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -1,4 +1,5 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T +# Copyright (c) 2018 Amdocs, Bell Canada, AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -39,7 +40,7 @@ spec: spec: initContainers: - command: - - /root/ready.py + - /app/ready.py args: - --container-name - aai-resources @@ -53,7 +54,7 @@ spec: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: "{{ .Values.global.legacyReadinessRepository }}/{{ .Values.global.legacyReadinessImage }}" + image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness containers: diff --git a/values.yaml b/values.yaml index 36245f9..9f4b6b2 100644 --- a/values.yaml +++ b/values.yaml @@ -1,5 +1,6 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications Copyright © 2018 AT&T +# Copyright (c) 2017 Amdocs, Bell Canada +# Modifications Copyright (c) 2018 AT&T +# Modifications Copyright (c) 2020 Nokia # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,8 +23,7 @@ global: # global defaults dockerhubRepository: docker.io busyboxImage: busybox - legacyReadinessRepository: oomk8s - legacyReadinessImage: readiness-check:2.2.2 + readinessImage: onap/oom/readiness:3.0.1 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 |