diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-05-04 01:28:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-04 01:28:33 +0000 |
| commit | fe05997c31aacb2929d176024f4259a36e0ba129 (patch) | |
| tree | 1592aa33574079de9d9c3578d7adce73b1b9328d /kubernetes/vnfsdk/charts/vnfsdk-postgres | |
| parent | 466ce25d0320f192a7e77ca4160c1fe4656071cf (diff) | |
| parent | 04aef9a9c2cd7911aef3951f1a15b18bdbb1a02c (diff) | |
Merge "VNFSDK - use embedded DB, change image path"
Diffstat (limited to 'kubernetes/vnfsdk/charts/vnfsdk-postgres')
| -rw-r--r-- | kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/deployment.yaml (renamed from kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/job.yaml) | 24 | ||||
| -rw-r--r-- | kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/service.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/vnfsdk/charts/vnfsdk-postgres/values.yaml | 5 |
3 files changed, 16 insertions, 15 deletions
diff --git a/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/job.yaml b/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/deployment.yaml index 62ca119ebd..88d6238f35 100644 --- a/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/job.yaml +++ b/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/deployment.yaml @@ -12,31 +12,33 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: batch/v1 -kind: Job +apiVersion: extensions/v1beta1 +kind: Deployment metadata: - name: {{ include "common.fullname" . }}-config + name: {{ include "common.fullname" . }} namespace: {{ include "common.namespace" . }} labels: - app: {{ include "common.name" . }}-job + app: {{ include "common.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app: {{ include "common.name" . }} template: metadata: labels: - app: {{ include "common.name" . }}-job + app: {{ include "common.name" . }} release: {{ .Release.Name }} + name: {{ include "common.name" . }} spec: - restartPolicy: Never - hostname: postgres + hostname: {{ include "common.name" . }} containers: - - name: {{ include "common.name" . }}-job + - args: image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }} - env: - - name: DB_HOST - value: "{{ include "common.servicename" . }}" + name: {{ include "common.name" . }} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/service.yaml b/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/service.yaml index 55221b13f7..f6208cf965 100644 --- a/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/service.yaml +++ b/kubernetes/vnfsdk/charts/vnfsdk-postgres/templates/service.yaml @@ -32,7 +32,7 @@ spec: - port: {{ .Values.service.externalPort }} targetPort: {{ .Values.service.internalPort }} {{- end}} - name: {{ .Values.service.portName }} + name: {{ .Values.service.portName | default "http" }} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} diff --git a/kubernetes/vnfsdk/charts/vnfsdk-postgres/values.yaml b/kubernetes/vnfsdk/charts/vnfsdk-postgres/values.yaml index 4329a222e2..c35a1f9973 100644 --- a/kubernetes/vnfsdk/charts/vnfsdk-postgres/values.yaml +++ b/kubernetes/vnfsdk/charts/vnfsdk-postgres/values.yaml @@ -29,7 +29,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/refrepo/postgres:latest +image: onap/vnfsdk/refrepo/postgres:latest pullPolicy: Always # flag to enable debugging - application support required @@ -55,8 +55,7 @@ readiness: service: type: ClusterIP - name: vnfsdk-pgset - portName: vnfsdk-pgset + name: postgres internalPort: 5432 externalPort: 5432 |