diff options
author | Jack Lucas <jflucas@research.att.com> | 2020-06-12 18:36:55 -0400 |
---|---|---|
committer | Jack Lucas <jflucas@research.att.com> | 2020-06-25 11:06:58 -0400 |
commit | 8c3463edb61ff3dae46aab6ae6f4f0b4afe5cefd (patch) | |
tree | 01c11197e4d631996cfe3272d8d5c8dd039c7a1d /kubernetes/dcaegen2/components/dcae-bootstrap | |
parent | 1e9b0789277f884c4436c78c28b555493bcf9b09 (diff) |
[DCAE][DCAEMOD] Deploy R7 container images
Deploy new versions of cm-container, k8s-bootstrap-container
and healthcheck-container for DCAE.
Deploy a healthcheck-container for DCAEMOD.
Add readiness checks for aaf-cm for dcae-cloudify-manager,
dcae-inventory-api, and dcae-config-binding-service, to
avoid crash loops in the init phase.
Issue-ID: DCAEGEN2-2099
Issue-ID: DCAEGEN2-1789
Issue-ID: DCAEGEN2-2236
Issue-ID: DCAEGEN2-1864
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: I473a0cd0e3e00d39e6c33d87781581ec527fbc89
Diffstat (limited to 'kubernetes/dcaegen2/components/dcae-bootstrap')
-rw-r--r-- | kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml | 10 | ||||
-rw-r--r-- | kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml index 9009f6b114..13657bd012 100644 --- a/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml +++ b/kubernetes/dcaegen2/components/dcae-bootstrap/templates/deployment.yaml @@ -74,7 +74,6 @@ spec: - dcae-inventory-api - "-t" - "15" - env: - name: NAMESPACE valueFrom: @@ -96,6 +95,15 @@ spec: volumeMounts: - mountPath: /opt/app/osaaf name: tls-info + - name: init-consul + image: {{ .Values.global.consulLoaderRepository }}/{{ .Values.global.consulLoaderImage }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + args: + - --service + - "config-binding-service|config-binding-service.{{ include "common.namespace" . }}|10000" + - --service + - "config_binding_service|config-binding-service.{{ include "common.namespace" . }}|10000" + resources: {} containers: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" diff --git a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml index a9cac8beac..bc409a549c 100644 --- a/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/components/dcae-bootstrap/values.yaml @@ -107,7 +107,7 @@ mongo: # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.12.6 +image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:2.0.0 default_k8s_location: central # DCAE component images to be deployed via Cloudify Manager |