github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #49222 from yujuhong/fix-l7-backend 

Automatic merge from submit-queue (batch tested with PRs 49222, 49333, 48708, 49337)

glbc: change the label of the l7-lb-controller pod

This ensures that the default http backend service doesn't include this
pod as its endpoint. This fixes #49159
pull/6/head
Kubernetes Submit Queue 2017-07-20 23:01:16 -07:00 committed by GitHub
parent 04df1f562b 780af313d6
commit d2c5dd64ee
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/saltbase/salt/l7-gcp/glbc.manifest
View File

@ -6,9 +6,8 @@ metadata:
annotations:
scheduler.alpha.kubernetes.io/critical-pod: ''
labels:
k8s-app: glbc
k8s-app: gcp-lb-controller
version: v0.9.5
kubernetes.io/cluster-service: "true"
kubernetes.io/name: "GLBC"
spec:
terminationGracePeriodSeconds: 600