Merge pull request #40565 from bprashanth/glbc-version

Automatic merge from submit-queue (batch tested with PRs 40126, 40565, 38777, 40564, 40572) Bump up glbc version to 0.9.0-beta.1 I plan to bump up the version to 0.9.0 proper in time for the next 1.5.x release, and cherry-pick both this and the future pr. Previously we were just using a single version, but the "-beta/alpha" is consistent with how we release kube and gives us a convenient revert target. It also forces us to remove the "beta" tag before code freeze, and track the kubernetes release cycle.
kubernetes · Jan 27, 2017 · e80da46 · e80da46
2 parents 88890f5 + b1e0bd0
commit e80da46
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cluster/saltbase/salt/l7-gcp/glbc.manifest b/cluster/saltbase/salt/l7-gcp/glbc.manifest
@@ -1,18 +1,18 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: l7-lb-controller-v0.8.0
+  name: l7-lb-controller-v0.9.0
   namespace: kube-system
   labels:
     k8s-app: glbc
-    version: v0.8.0
+    version: v0.9.0
     kubernetes.io/cluster-service: "true"
     kubernetes.io/name: "GLBC"
 spec:
   terminationGracePeriodSeconds: 600
   hostNetwork: true
   containers:
-  - image: gcr.io/google_containers/glbc:0.9.0
+  - image: gcr.io/google_containers/glbc:0.9.0-beta.1
     livenessProbe:
       httpGet:
         path: /healthz
@@ -43,7 +43,7 @@ spec:
     # TODO: split this out into args when we no longer need to pipe stdout to a file #6428
     - sh
     - -c
-    - '/glbc --verbose=true --default-backend-service=kube-system/default-http-backend --sync-period=60s --running-in-cluster=false --use-real-cloud=true --config-file-path=/etc/gce.conf --healthz-port=8086 1>>/var/log/glbc.log 2>&1'
+    - '/glbc --verbose=true --default-backend-service=kube-system/default-http-backend --sync-period=600s --running-in-cluster=false --use-real-cloud=true --config-file-path=/etc/gce.conf --healthz-port=8086 1>>/var/log/glbc.log 2>&1'
   volumes:
   - hostPath:
       path: /etc/gce.conf