Merge pull request mpandav#12 from alexandrev-tibco/tp-provisioner-ag…

…ent-ingress-2 Changes to including Host *.eu-west.my.tibco.com in the HA Proxy Ingress Rules
alexandrev-tibco · Aug 21, 2024 · 9033a42 · 9033a42
2 parents 992f441 + 9b4179e
commit 9033a42
Show file tree

Hide file tree

Showing 10 changed files with 106 additions and 6 deletions.
diff --git 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
@@ -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
@@ -4,7 +4,7 @@
 
 apiVersion: v2
 name: bwprovisioner
-version: 1.2.16
+version: 1.2.17
 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/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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 -}}