UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit a2814a31 authored by Micah Nagel's avatar Micah Nagel
Browse files

Merge branch 'micah.nagel-master-patch-42168' into 'master'

Update HAProxy to remove VirtualService

Closes #921

See merge request platform-one/big-bang/bigbang!1104
parents 0c39ee6e 37efac9c
No related branches found
No related tags found
2 merge requests!1386Master,!1104Update HAProxy to remove VirtualService
Pipeline #569868 failed
......@@ -6,12 +6,6 @@
{{- define "bigbang.defaults.haproxy-sso" -}}
# hostname is deprecated and replaced with domain. But if hostname exists then use it.
{{- $domainName := default .Values.domain .Values.hostname }}
hostname: {{ $domainName }}
domain: {{ $domainName }}
istio:
gateway: {{ default "public" .Values.addons.haproxy.ingress.gateway }}
{{- $haproxyAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }}
{{- $haproxyAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }}
podLabels:
......
......@@ -829,15 +829,11 @@ addons:
git:
repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/haproxy
path: "./chart"
tag: 1.1.2-bb.1
tag: "1.1.2-bb.2"
# -- Flux reconciliation overrides specifically for the HAProxy Package
flux: {}
# Redirect the package ingress to a specific Istio Gateway (listed in `istio.gateways`). The default is "public".
ingress:
gateway: ""
# -- Values to passthrough to the haproxy chart: https://repo1.dso.mil/platform-one/big-bang/apps/sandbox/haproxy.git
values: {}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment