summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorJack Lucas <jflucas@research.att.com>2019-02-12 17:09:46 -0500
committerJack Lucas <jflucas@research.att.com>2019-02-12 17:27:04 -0500
commit4c4ba44aaa446d992f6edaa8ba784ff485d25bce (patch)
tree9de33a347c847315eb87b6734cfc520cc2cdab9d /kubernetes
parent7e74fe48ccfe1b1aa46d163390d7b46166d6c853 (diff)
Fix image versioning
Issue-ID: DCAEGEN2-1191 Change-Id: Iec7531700d56ee08aa345f19c12fc1dd1004b897 Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml12
-rw-r--r--kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml4
-rw-r--r--kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml2
-rw-r--r--kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml4
4 files changed, 10 insertions, 12 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml
index e49be94a79..e3e4aaf5cd 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/templates/deployment.yaml
@@ -52,13 +52,15 @@ spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}:{{ .Values.image_version }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- command: ["java"]
+ # Assumes that the Docker image is built with ENTRYPOINT set to
+ # ["java", "-jar", "/opt/inventory-api-x.y.z.jar", "server"]
+ # where "x.y.z" is the version number (matches the Docker image version number)
+ # The arg below adds a parameter, the path to a config file.
+ # This tells the inventory-api app to get its configuration from the file
+ # rather than querying Consul.
args:
- - "-jar"
- - "/opt/inventory-api-{{ .Values.image_version }}.jar"
- - "server"
- "/opt/config.json"
resources:
{{ include "common.resources" . | indent 12 }}
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml
index 5be3b34c4e..1fd004f2bd 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/charts/dcae-inventory-api/values.yaml
@@ -42,9 +42,7 @@ config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.platform.inventory-api
-# need the version to be separate because it's used in 2 places
-image_version: 3.0.1
+image: onap/org.onap.dcaegen2.platform.inventory-api:3.0.4
pullPolicy: Always
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml
index dc802a7892..44ebc42412 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/templates/deployment.yaml
@@ -56,7 +56,7 @@ spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}
- image: "{{ include "common.repository" . }}/{{ .Values.image }}:{{ .Values.image_version }}"
+ image: "{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["java"]
args:
diff --git a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml
index b92f41703f..dd985163c1 100644
--- a/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-servicechange-handler/values.yaml
@@ -40,9 +40,7 @@ config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.platform.servicechange-handler
-# need the version to be separate because it's used in 2 places
-image_version: 1.1.5
+image: onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5
pullPolicy: Always