Skip to content

Commit 985a126

Browse files
committed
update ha proxy for logging
1 parent e9eb19d commit 985a126

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/k8s-create-service-mesh.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
shell: bash
4545
- name: Add annotation to haproxy deployment
4646
run: |
47-
kubectl get -n haproxy-controller deploy -o yaml | linkerd inject --skip-inbound-ports 80,443 - | kubectl apply -f -
47+
kubectl get -n haproxy-controller deploy -o yaml | linkerd inject --skip-inbound-ports 8080,8443,80,443 - | kubectl apply -f -
4848
# Explicit egress is necessary so that default opaque ports are used properly
4949
# See: https://github.com/linkerd/linkerd2/issues/13475
5050
- name: Add linkerd explicit egress

.github/workflows/k8s-setup-otc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ jobs:
5454
5555
helm upgrade --install haproxy-kubernetes-ingress haproxytech/kubernetes-ingress --create-namespace --namespace haproxy-controller -f - <<EOF
5656
controller:
57-
logging:
58-
traffic:
59-
address: stdout
60-
level: info
61-
facility: daemon
6257
service:
6358
annotations:
6459
kubernetes.io/elb.class: union
@@ -68,6 +63,11 @@ jobs:
6863
externalTrafficPolicy: Local
6964
config:
7065
cr-global: haproxy-controller/haproxy-global
66+
defaults-config-snippet: |
67+
log global
68+
option httplog
69+
global-config-snippet: |
70+
log stdout format raw local0 info
7171
EOF
7272
- name: Install Global CRD
7373
run: |

0 commit comments

Comments
 (0)