diff --git a/charts/artifactmanager/Chart.yaml b/charts/artifactmanager/Chart.yaml index c0057aa9..c96254dd 100644 --- a/charts/artifactmanager/Chart.yaml +++ b/charts/artifactmanager/Chart.yaml @@ -5,6 +5,6 @@ # apiVersion: v2 name: artifactmanager -version: 1.2.14 +version: 1.2.15 appVersion: "1.2.0" description: A Helm chart for Artifact Manager diff --git a/charts/artifactmanager/templates/ingress.yaml b/charts/artifactmanager/templates/ingress.yaml index e8c28ed4..8b2b8466 100644 --- a/charts/artifactmanager/templates/ingress.yaml +++ b/charts/artifactmanager/templates/ingress.yaml @@ -70,4 +70,29 @@ spec: port: number: {{ $.Values.service.port }} {{- end }} + - host: "*.eu-west.my.tibco.com" + http: + {{- if $.Values.ingress.hostsOverride -}} + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + service: + name: {{ $fullName }} + port: + number: {{ $.Values.service.port }} + {{- end }} + {{- else}} + paths: + - path: /tibco/agent/integration/{{ $.Values.global.cp.instanceId }}/artifactmanager/ + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $.Values.service.port }} + {{- end }} {{- end }} diff --git a/charts/bwprovisioner/Chart.yaml b/charts/bwprovisioner/Chart.yaml index 52fcf516..6c2d4e19 100644 --- a/charts/bwprovisioner/Chart.yaml +++ b/charts/bwprovisioner/Chart.yaml @@ -4,7 +4,7 @@ apiVersion: v2 name: bwprovisioner -version: 1.2.16 +version: 1.2.19 appVersion: "1.2.0" description: TIBCO Platform Dataplane Capabilty -- BW Provisioner home: https://github.com/tibco/tp-iapp-bw-provisioner.git diff --git a/charts/bwprovisioner/templates/_helpers.tpl b/charts/bwprovisioner/templates/_helpers.tpl index af9825b5..8db94fd9 100644 --- a/charts/bwprovisioner/templates/_helpers.tpl +++ b/charts/bwprovisioner/templates/_helpers.tpl @@ -111,7 +111,7 @@ Integration storage folder pvc name {{- define "bwprovisioner.appinit.const.ecrImageRepo" }}piap{{end}} {{- define "bwprovisioner.appinit.const.acrImageRepo" }}piap{{end}} {{- define "bwprovisioner.appinit.const.harborImageRepo" }}piap{{end}} -{{- define "bwprovisioner.appinit.const.defaultImageRepo" }}piap{{end}} +{{- define "bwprovisioner.appinit.const.defaultImageRepo" }}pea-coreintegration/tibco-control-plane/tibco-platform-local-docker/integration{{end}} {{/* set repository based on the registry url. We will have different repo for each one. */}} {{- define "bwprovisioner.appinit.image.repository" -}} diff --git a/charts/bwprovisioner/templates/ingress.yaml b/charts/bwprovisioner/templates/ingress.yaml index aa6bef6a..5a397fd2 100644 --- a/charts/bwprovisioner/templates/ingress.yaml +++ b/charts/bwprovisioner/templates/ingress.yaml @@ -70,4 +70,29 @@ spec: port: number: {{ $.Values.service.port }} {{- end }} + - host: "*.eu-west.my.tibco.com" + http: + {{- if $.Values.ingress.hostsOverride -}} + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + service: + name: {{ $fullName }} + port: + number: {{ $.Values.service.port }} + {{- end }} + {{- else}} + paths: + - path: /tibco/agent/integration/{{ $.Values.global.cp.instanceId }}/bwprovisioner/ + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $.Values.service.port }} + {{- end }} {{- end }} diff --git a/charts/bwprovisioner/templates/ingress_public_nginx.yaml b/charts/bwprovisioner/templates/ingress_public_nginx.yaml index bf142853..c55c87aa 100644 --- a/charts/bwprovisioner/templates/ingress_public_nginx.yaml +++ b/charts/bwprovisioner/templates/ingress_public_nginx.yaml @@ -33,6 +33,6 @@ spec: name: {{ $fullName }} port: number: {{ $.Values.publicApiService.targetPort }} - path: {{ .Values.publicApi.ingress.nginx.pathPrefix }} - pathType: Prefix + path: {{ .Values.publicApi.ingress.nginx.pathPrefix }}/(.*) + pathType: ImplementationSpecific {{- end }} diff --git a/charts/dp-core-infrastructure/Chart.yaml b/charts/dp-core-infrastructure/Chart.yaml index 49de47ed..46d6d4e2 100644 --- a/charts/dp-core-infrastructure/Chart.yaml +++ b/charts/dp-core-infrastructure/Chart.yaml @@ -27,4 +27,4 @@ dependencies: description: A Helm chart for Data Plane Infrastructure name: dp-core-infrastructure type: application -version: 1.2.25 +version: 1.2.26 diff --git a/charts/dp-core-infrastructure/charts/tp-provisioner-agent/Chart.yaml b/charts/dp-core-infrastructure/charts/tp-provisioner-agent/Chart.yaml index c314bc71..eb998614 100644 --- a/charts/dp-core-infrastructure/charts/tp-provisioner-agent/Chart.yaml +++ b/charts/dp-core-infrastructure/charts/tp-provisioner-agent/Chart.yaml @@ -12,4 +12,4 @@ keywords: - provisioner-agent - data-plane name: tp-provisioner-agent -version: 1.2.12 +version: 1.2.13 diff --git a/charts/dp-core-infrastructure/charts/tp-provisioner-agent/templates/ingress.yaml b/charts/dp-core-infrastructure/charts/tp-provisioner-agent/templates/ingress.yaml index b017fd79..0d5d8b08 100644 --- a/charts/dp-core-infrastructure/charts/tp-provisioner-agent/templates/ingress.yaml +++ b/charts/dp-core-infrastructure/charts/tp-provisioner-agent/templates/ingress.yaml @@ -22,7 +22,7 @@ spec: name: {{ include "tp-provisioner-agent.consts.appName" . }} port: number: 80 - - host: "cpdpproxy" + - host: "*.eu-west.my.tibco.com" http: paths: - pathType: Prefix diff --git a/charts/o11y-service/Chart.yaml b/charts/o11y-service/Chart.yaml index a906dedf..4d6883fa 100644 --- a/charts/o11y-service/Chart.yaml +++ b/charts/o11y-service/Chart.yaml @@ -5,6 +5,6 @@ # apiVersion: v2 name: o11yservice -version: 1.2.32 +version: 1.2.33 appVersion: "1.2.0" description: A helm chart for o11y service diff --git a/charts/o11y-service/templates/ingress.yaml b/charts/o11y-service/templates/ingress.yaml index 530c311f..c56af35b 100644 --- a/charts/o11y-service/templates/ingress.yaml +++ b/charts/o11y-service/templates/ingress.yaml @@ -70,4 +70,29 @@ spec: port: number: {{ $.Values.service.port }} {{- end }} + - host: "*.eu-west.my.tibco.com" + http: + {{- if $.Values.ingress.hostsOverride -}} + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + service: + name: {{ $fullName }} + port: + number: {{ $.Values.service.port }} + {{- end }} + {{- else}} + paths: + - path: /tibco/agent/o11y/{{ $.Values.global.cp.instanceId }}/o11y-service/ + pathType: Prefix + backend: + service: + name: {{ $fullName }} + port: + number: {{ $.Values.service.port }} + {{- end }} {{- end -}} diff --git a/charts/o11y-service/templates/ingress_jaeger.yaml b/charts/o11y-service/templates/ingress_jaeger.yaml index b455e22a..e94ea880 100644 --- a/charts/o11y-service/templates/ingress_jaeger.yaml +++ b/charts/o11y-service/templates/ingress_jaeger.yaml @@ -70,4 +70,29 @@ spec: port: number: {{ $.Values.jaeger.service.port }} {{- end }} + - host: "*.eu-west.my.tibco.com" + http: + {{- if $.Values.jaeger.ingress.hostsOverride -}} + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + service: + name: {{ $.Values.jaeger.service.name }} + port: + number: {{ $.Values.jaeger.service.port }} + {{- end }} + {{- else}} + paths: + - path: /tibco/agent/o11y/{{ $.Values.global.cp.instanceId }}/jaeger-query/ + pathType: Prefix + backend: + service: + name: {{ $.Values.jaeger.service.name }} + port: + number: {{ $.Values.jaeger.service.port }} + {{- end }} {{- end -}}