diff options
Diffstat (limited to 'kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs')
8 files changed, 14 insertions, 8 deletions
diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-config_binding_service-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-config_binding_service-inputs.yaml index 0ee60c7a75..72a3441d31 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-config_binding_service-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-config_binding_service-inputs.yaml @@ -18,4 +18,6 @@ #TODO would like to make this conditional, as with the other input templates # but having template expansion issues trying to do that -cbs_image: {{ .Values.componentImages.config_binding_service }} +{{ if .Values.componentImages.config_binding_service }} +cbs_image: {{ include "common.repository" . }}/{{ .Values.componentImages.config_binding_service }} +{{ end }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-deployment_handler-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-deployment_handler-inputs.yaml index 41432548c0..4f7c67003b 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-deployment_handler-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-deployment_handler-inputs.yaml @@ -18,7 +18,7 @@ # # ECOMP is a trademark and service mark of AT&T Intellectual Property. {{ if .Values.componentImages.deployment_handler }} -deployment_handler_image: {{ .Values.componentImages.deployment_handler }} +deployment_handler_image: {{ include "common.repository" . }}/{{ .Values.componentImages.deployment_handler }} {{ end }} application_config: cloudify: diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml index dac0ffa207..b831602130 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_engine-inputs.yaml @@ -18,7 +18,7 @@ { {{ if .Values.componentImages.holmes_engine }} - "he_image" : "{{ .Values.componentImages.holmes_engine }}", + "he_image" : '{{ include "common.repository" . }}/{{ .Values.componentImages.holmes_engine }}', {{ end }} "msb_hostname": "{{ .Values.config.address.msb_discovery }}.{{include "common.namespace" . }}", "dcae_CL_publish_url": "http://{{ .Values.config.address.message_router }}.{{include "common.namespace" . }}:3904/events/unauthenticated.DCAE_CL_OUTPUT", diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml index 1a808d4eb7..d1413fcdbd 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-holmes_rules-inputs.yaml @@ -17,6 +17,10 @@ # ============LICENSE_END========================================================= { +{{ if .Values.componentImages.holmes_rules }} + "hr_image" : '{{ include "common.repository" . }}/{{ .Values.componentImages.holmes_rules }}', +{{ end }} + "msb_hostname": "{{ .Values.config.address.msb_discovery }}.{{include "common.namespace" . }}", "pgaas_cluster_name" : "{{ .Values.postgres.service.name2 }}.{{include "common.namespace" . }}", "database_name":"holmes" diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml index f2127606b5..a4fdfbb197 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-inventory-inputs.yaml @@ -25,8 +25,8 @@ sdc_msg_bus_address: '{{ .Values.config.address.message_router }}.{{include "com postgres_user_inventory: "postgres" postgres_password_inventory: "onap123" {{ if .Values.componentImages.service_change_handler }} -service_change_handler_image: {{ .Values.componentImages.service_change_handler }} +service_change_handler_image: '{{ include "common.repository" . }}/{{ .Values.componentImages.service_change_handler }}' {{ end }} {{ if .Values.componentImages.inventory }} -inventory_image: "{{ .Values.componentImages.inventory }}" +inventory_image: '{{ include "common.repository" . }}/{{ .Values.componentImages.inventory }}' {{ end }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml index 8c8d83cebe..846bc43290 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-policy_handler-inputs.yaml @@ -17,7 +17,7 @@ # ============LICENSE_END========================================================= {{ if .Values.componentImages.policy_handler }} -policy_handler_image: {{ .Values.componentImages.policy_handler }} +policy_handler_image: {{ include "common.repository" . }}/{{ .Values.componentImages.policy_handler }} {{ end }} application_config: policy_handler : diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml index f3a6ccaad8..d998dfa418 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-tca-inputs.yaml @@ -17,7 +17,7 @@ # ============LICENSE_END========================================================= {{ if .Values.componentImages.tca }} -tca_image: {{ .Values.componentImages.tca }} +tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.tca }} {{ end }} dmaap_host: {{ .Values.config.address.message_router }}.{{include "common.namespace" . }} consul_host: {{ .Values.config.address.consul.host }}.{{include "common.namespace" . }} diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml index 80625be70c..276de2a358 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/resources/inputs/k8s-ves-inputs.yaml @@ -17,7 +17,7 @@ # ============LICENSE_END========================================================= {{ if .Values.componentImages.ves }} -tag_version: {{ .Values.componentImages.ves }} +tag_version: {{ include "common.repository" . }}/{{ .Values.componentImages.ves }} {{ end }} external_port : "30235" ves_other_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_OTHER_OUTPUT/" |