Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tp provisioner agent ingress 2 #1

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Tp provisioner agent ingress 2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8164197
Changes to including Host *.my.tibco.com in the HA Proxy Ingress Rules
Aug 21, 2024
11f1634
Ammend it to *.eu-west.my.tibco.com
Aug 21, 2024
527a2ba
+1
Aug 21, 2024
9b4179e
Fix missing {{ end }}
Aug 21, 2024
9033a42
Merge pull request #12 from alexandrev-tibco/tp-provisioner-agent-ing…
mbloomfi-tibco Aug 21, 2024
3347166
Fix issue with wrong path for bwce init container.
mbloomfi-tibco Aug 22, 2024
4293ff2
Bump version of BW Provisioner chart to 1.2.18
mbloomfi-tibco Aug 22, 2024
aa5971d
Merge pull request #13 from mpandav/bw-provisioner-reg
mbloomfi-tibco Aug 22, 2024
ed97768
Change Ingress to be PlatformSpecific for bwprovisioner
Aug 22, 2024
92d19af
Fix issue with wrong path for bwce init container.
mbloomfi-tibco Aug 22, 2024
f9736e6
Bump version of the chart
Aug 22, 2024
f1d477a
Merge branch 'main' into tp-provisioner-agent-ingress-2
alexandrev-tibco Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/artifactmanager/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 25 additions & 0 deletions charts/artifactmanager/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion charts/bwprovisioner/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/bwprovisioner/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" -}}
Expand Down
25 changes: 25 additions & 0 deletions charts/bwprovisioner/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
4 changes: 2 additions & 2 deletions charts/bwprovisioner/templates/ingress_public_nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion charts/dp-core-infrastructure/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion charts/dp-core-infrastructure/charts/tp-provisioner-agent/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ keywords:
- provisioner-agent
- data-plane
name: tp-provisioner-agent
version: 1.2.12
version: 1.2.13
2 changes: 1 addition & 1 deletion charts/dp-core-infrastructure/charts/tp-provisioner-agent/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/o11y-service/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 25 additions & 0 deletions charts/o11y-service/templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
25 changes: 25 additions & 0 deletions charts/o11y-service/templates/ingress_jaeger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Loading