From b9d178f5ab56d168c9c68f0e476e658019a58378 Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Fri, 29 Jun 2018 10:32:51 -0700 Subject: [PATCH 1/2] bump ingress version to 1.2 --- cluster/gce/manifests/glbc.manifest | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/gce/manifests/glbc.manifest b/cluster/gce/manifests/glbc.manifest index 15fc6cf99cb..2bacce0aae1 100644 --- a/cluster/gce/manifests/glbc.manifest +++ b/cluster/gce/manifests/glbc.manifest @@ -1,20 +1,20 @@ apiVersion: v1 kind: Pod metadata: - name: l7-lb-controller-v1.1.1 + name: l7-lb-controller-v1.2.2 namespace: kube-system annotations: scheduler.alpha.kubernetes.io/critical-pod: '' seccomp.security.alpha.kubernetes.io/pod: 'docker/default' labels: k8s-app: gcp-lb-controller - version: v1.1.1 + version: v1.2.2 kubernetes.io/name: "GLBC" spec: terminationGracePeriodSeconds: 600 hostNetwork: true containers: - - image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.1.1 + - image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.2.2 livenessProbe: httpGet: path: /healthz From ddaca74de55fc26601a830ff79ed968745fc680d Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Fri, 29 Jun 2018 14:44:08 -0700 Subject: [PATCH 2/2] remove unreleased tag --- test/e2e/network/ingress.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/network/ingress.go b/test/e2e/network/ingress.go index 042e6dfef3a..33e326247da 100644 --- a/test/e2e/network/ingress.go +++ b/test/e2e/network/ingress.go @@ -540,7 +540,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() { jig.WaitForIngress(true) }) - It("should be able to create a ClusterIP service [Unreleased]", func() { + It("should be able to create a ClusterIP service", func() { var err error By("Create a basic HTTP ingress using NEG") jig.CreateIngress(filepath.Join(framework.IngressManifestPath, "neg-clusterip"), ns, map[string]string{}, map[string]string{}) @@ -649,7 +649,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() { }) }) - It("should sync endpoints for both Ingress-referenced NEG and standalone NEG [Unreleased]", func() { + It("should sync endpoints for both Ingress-referenced NEG and standalone NEG", func() { name := "hostname" expectedKeys := []int32{80, 443}