mirror of https://github.com/k3s-io/k3s
Merge pull request #62427 from nicksardo/bump-glbc
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 ```pull/8/head
commit
66b5978113
|
@ -1,19 +1,19 @@
|
|||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: l7-lb-controller-v1.0.1
|
||||
name: l7-lb-controller-v1.1.0
|
||||
namespace: kube-system
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||
labels:
|
||||
k8s-app: gcp-lb-controller
|
||||
version: v1.0.1
|
||||
version: v1.1.0
|
||||
kubernetes.io/name: "GLBC"
|
||||
spec:
|
||||
terminationGracePeriodSeconds: 600
|
||||
hostNetwork: true
|
||||
containers:
|
||||
- image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.0.1
|
||||
- image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.1.0
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /healthz
|
||||
|
|
|
@ -311,7 +311,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
|
|||
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.")
|
||||
jig.CreateIngress(filepath.Join(framework.IngressManifestPath, "multiple-certs"), ns, map[string]string{
|
||||
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 (gau): Remove [Unreleased] label once HTTP2 is in the next Ingress release
|
||||
It("should be able to switch between HTTPS and HTTP2 modes [Unreleased]", func() {
|
||||
It("should be able to switch between HTTPS and HTTP2 modes", func() {
|
||||
httpsScheme := "request_scheme=https"
|
||||
|
||||
By("Create a basic HTTP2 ingress")
|
||||
|
|
Loading…
Reference in New Issue