diff options
Diffstat (limited to 'kubernetes/dcaegen2')
16 files changed, 46 insertions, 34 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-input.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-input.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 8b5da2efe6..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 @@ -24,7 +24,9 @@ sdc_environment_name: "AUTO" sdc_msg_bus_address: '{{ .Values.config.address.message_router }}.{{include "common.namespace" . }}' postgres_user_inventory: "postgres" postgres_password_inventory: "onap123" -service_change_handler_image: {{ .Values.componentImages.service_change_handler }} +{{ if .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 2e41d1c4b3..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,10 +17,10 @@ # ============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/" ves_heartbeat_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/" ves_fault_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_FAULT_OUTPUT/" -ves_measurement_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT/" +ves_measurement_publish_url: "http://{{ .Values.config.address.message_router }}:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT/" diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml index 02909f79b7..a89ad7d710 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/templates/job.yaml @@ -81,6 +81,10 @@ spec: key: password - name: CONSUL value: {{ .Values.config.address.consul.host }}:{{ .Values.config.address.consul.port }} + - name: DCAE_NAMESPACE + value: {{ .Values.dcae_ns | default "" }} + - name: ONAP_NAMESPACE + value: {{ include "common.namespace" . }} volumes: - name: {{ include "common.fullname" . }}-dcae-inputs configMap: diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml index e8927eb0bd..1a6357a96d 100644 --- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml @@ -21,9 +21,8 @@ ################################################################# global: nodePortPrefix: 302 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiZGNhZUBkY2FlLm9uYXAub3JnIiwiYXV0aCI6IlpHOWphMlZ5T21SdlkydGxjZz09In19 readinessRepository: oomk8s - readinessImage: readiness-check:1.1.0 + readinessImage: readiness-check:2.0.0 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 @@ -57,7 +56,9 @@ postgres: config: pgPrimaryPassword: onapdemodb pgRootPassword: onapdemodb - + persistence: + mountSubPath: dcae/data + mountInitPath: dcae # application image repository: nexus3.onap.org:10001 @@ -67,17 +68,17 @@ image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:latest # Use to override default setting in blueprints componentImages: #TODO for further investigation: input template expansion issues if we comment this out - config_binding_service: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.1.5 -# deployment_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.deployment-handler:2.1.1 -# holmes_engine: nexus3.onap.org:10001//onap/holmes/engine-management:v1.0.0 -# holmes_rules: nexus3.onap.org:10001/onap/holmes/rule-management:v1.0.0 - inventory: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api:3.0.1 - policy_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.policy-handler:2.4.1 - service_change_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.3 -# tca: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container.tca-cdap-container:1.0.0 -# ves: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1-latest + config_binding_service: onap/org.onap.dcaegen2.platform.configbinding:latest + deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:latest + holmes_engine: onap/holmes/engine-management:latest + holmes_rules: onap/holmes/rule-management:latest + inventory: onap/org.onap.dcaegen2.platform.inventory-api:latest + policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:latest + service_change_handler: onap/org.onap.dcaegen2.platform.servicechange-handler:latest + tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:latest + ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:latest # Kubernetes namespace for components deployed via Cloudify manager # If empty, use the common namespace -dcae_ns: "dcae" +# dcae_ns: "onap" diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml index 732110be6d..ff0b8312b3 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/secret.yaml @@ -17,7 +17,6 @@ # ============LICENSE_END========================================================= {{ if .Values.dcae_ns}} -# Create the registry key secret in dcae namespace apiVersion: v1 kind: Secret metadata: @@ -29,10 +28,10 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - .dockercfg: {{ .Values.global.repositorySecret | default .Values.repositorySecret }} + .dockercfg: {{ include "common.repository.secret" . }} type: kubernetes.io/dockercfg -{{ end }} --- +{{ end }} # Copy of the API token secret, needed to work around /var/run/secrets mount problem apiVersion: v1 kind: Secret diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml index 4b76523c57..56b2c619c7 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/templates/service.yaml @@ -63,6 +63,7 @@ spec: type: ExternalName externalName: {{ .Values.service.name }}.{{ include "common.namespace" . }}.svc.cluster.local {{ end }} +--- # Provide alternate name for consul in common namespace to support CM plugin discovery apiVersion: v1 kind: Service diff --git a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml index 28b96e75b7..6d87be3441 100644 --- a/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-cloudify-manager/values.yaml @@ -21,11 +21,13 @@ ################################################################# global: nodePortPrefix: 302 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiZGNhZUBkY2FlLm9uYXAub3JnIiwiYXV0aCI6IlpHOWphMlZ5T21SdlkydGxjZz09In19 readinessRepository: oomk8s - readinessImage: readiness-check:1.1.0 + readinessImage: readiness-check:2.0.0 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 + repositoryCred: + user: docker + password: docker config: logstashServiceName: log-ls @@ -64,4 +66,4 @@ service: # Kubernetes namespace for components deployed via Cloudify manager # If empty, use the common namespace -dcae_ns: "dcae" +# dcae_ns: "dcae" diff --git a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml index a4d2f292a5..c10e2403a3 100644 --- a/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-healthcheck/values.yaml @@ -21,9 +21,8 @@ ################################################################# global: nodePortPrefix: 302 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiZGNhZUBkY2FlLm9uYXAub3JnIiwiYXV0aCI6IlpHOWphMlZ5T21SdlkydGxjZz09In19 readinessRepository: oomk8s - readinessImage: readiness-check:1.1.0 + readinessImage: readiness-check:2.0.0 loggingRepository: docker.elastic.co loggingImage: beats/filebeat:5.5.0 @@ -46,9 +45,9 @@ readiness: periodSeconds: 10 # application image repository: nexus3.onap.org:10001 -image: onap/org.onap.dcaegen2.deployments.healthcheck-container:1.0.0 +image: onap/org.onap.dcaegen2.deployments.healthcheck-container:latest # Kubernetes namespace for components deployed via Cloudify manager # If empty, use the common namespace -dcae_ns: "dcae" +# dcae_ns: "onap" diff --git a/kubernetes/dcaegen2/charts/dcae-redis/values.yaml b/kubernetes/dcaegen2/charts/dcae-redis/values.yaml index bcf1750b22..8550da074b 100644 --- a/kubernetes/dcaegen2/charts/dcae-redis/values.yaml +++ b/kubernetes/dcaegen2/charts/dcae-redis/values.yaml @@ -17,7 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== readinessRepository: oomk8s readinessImage: readiness-check:2.0.0 loggingRepository: docker.elastic.co diff --git a/kubernetes/dcaegen2/values.yaml b/kubernetes/dcaegen2/values.yaml index 144174390b..7158f63dc7 100644 --- a/kubernetes/dcaegen2/values.yaml +++ b/kubernetes/dcaegen2/values.yaml @@ -17,7 +17,6 @@ ################################################################# global: nodePortPrefix: 302 - repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== redis: replicaCount: 6 |