mirror of https://github.com/k3s-io/k3s
Merge pull request #65641 from freehan/bump-ingress
Automatic merge from submit-queue (batch tested with PRs 66342, 66330, 65641). 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 ingress version to 1.2 ```release-note Bump Ingress-gce version to 1.2.0 ```pull/8/head
commit
b1d97e5bb1
|
@ -1,20 +1,20 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
name: l7-lb-controller-v1.1.1
|
name: l7-lb-controller-v1.2.2
|
||||||
namespace: kube-system
|
namespace: kube-system
|
||||||
annotations:
|
annotations:
|
||||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
scheduler.alpha.kubernetes.io/critical-pod: ''
|
||||||
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
|
seccomp.security.alpha.kubernetes.io/pod: 'docker/default'
|
||||||
labels:
|
labels:
|
||||||
k8s-app: gcp-lb-controller
|
k8s-app: gcp-lb-controller
|
||||||
version: v1.1.1
|
version: v1.2.2
|
||||||
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.1.1
|
- image: k8s.gcr.io/ingress-gce-glbc-amd64:v1.2.2
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /healthz
|
path: /healthz
|
||||||
|
|
|
@ -540,7 +540,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
|
||||||
jig.WaitForIngress(true)
|
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
|
var err error
|
||||||
By("Create a basic HTTP ingress using NEG")
|
By("Create a basic HTTP ingress using NEG")
|
||||||
jig.CreateIngress(filepath.Join(framework.IngressManifestPath, "neg-clusterip"), ns, map[string]string{}, map[string]string{})
|
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"
|
name := "hostname"
|
||||||
expectedKeys := []int32{80, 443}
|
expectedKeys := []int32{80, 443}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue