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

Merge pull request #49222 from yujuhong/fix-l7-backend
d2c5dd64 · Kubernetes Submit Queue · GitHub · 04df1f56 · 780af313 · d2c5dd64
Commit d2c5dd64 authored Jul 20, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

glbc.manifest cluster/saltbase/salt/l7-gcp/glbc.manifest +1 -2

No files found.
--- a/cluster/saltbase/salt/l7-gcp/glbc.manifest
+++ b/cluster/saltbase/salt/l7-gcp/glbc.manifest
@@ -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