github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 22:20:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62427 from nicksardo/bump-glbc

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 62455, 62465, 62427, 62416, 62411). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump GLBC version and remove Unreleased tag from tests

/assign rramkumar1
/cc mrhohn

**Release note**:
```release-note
GCE: Bump GLBC version to 1.1.0 - supporting multiple certificates and HTTP2
```
This commit is contained in:
Kubernetes Submit Queue
2018-04-12 08:54:17 -07:00
committed by GitHub
parent a6468037b2 fc60d36a8e
commit 66b5978113
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/manifests/glbc.manifest
View File

@@ -1,19 +1,19 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: l7-lb-controller-v1.0.1 name: l7-lb-controller-v1.1.0
namespace: kube-system namespace: kube-system
annotations: annotations:
scheduler.alpha.kubernetes.io/critical-pod: '' scheduler.alpha.kubernetes.io/critical-pod: ''
labels: labels:
k8s-app: gcp-lb-controller k8s-app: gcp-lb-controller
version: v1.0.1 version: v1.1.0
kubernetes.io/name: "GLBC" kubernetes.io/name: "GLBC"
spec: spec:
terminationGracePeriodSeconds: 600 terminationGracePeriodSeconds: 600
hostNetwork: true hostNetwork: true
containers: containers:
- image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.0.1 - image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.1.0
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /healthz path: /healthz

5
test/e2e/network/ingress.go
View File

@@ -311,7 +311,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
executeBacksideBacksideHTTPSTest(f, jig, "") executeBacksideBacksideHTTPSTest(f, jig, "")
}) })
It("should support multiple TLS certs [Unreleased]", func() { It("should support multiple TLS certs", func() {
By("Creating an ingress with no certs.") By("Creating an ingress with no certs.")
jig.CreateIngress(filepath.Join(framework.IngressManifestPath, "multiple-certs"), ns, map[string]string{ jig.CreateIngress(filepath.Join(framework.IngressManifestPath, "multiple-certs"), ns, map[string]string{
framework.IngressStaticIPKey: ns, framework.IngressStaticIPKey: ns,
@@ -418,8 +418,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
// TODO(nikhiljindal): Check the instance group annotation value and verify with a multizone cluster. // TODO(nikhiljindal): Check the instance group annotation value and verify with a multizone cluster.
}) })
// TODO (gau): Remove [Unreleased] label once HTTP2 is in the next Ingress release It("should be able to switch between HTTPS and HTTP2 modes", func() {
It("should be able to switch between HTTPS and HTTP2 modes [Unreleased]", func() {
httpsScheme := "request_scheme=https" httpsScheme := "request_scheme=https"
By("Create a basic HTTP2 ingress") By("Create a basic HTTP2 ingress")