mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
[e2e ingress-gce] Retrieve the correct health check resource
This commit is contained in:
parent
0df0ecd528
commit
f5bb5234c1
@ -256,29 +256,27 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
|
|||||||
// Get cluster UID.
|
// Get cluster UID.
|
||||||
clusterID, err := framework.GetClusterID(f.ClientSet)
|
clusterID, err := framework.GetClusterID(f.ClientSet)
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
// Get default backend nodeport.
|
// Get the related nodeports.
|
||||||
defaultBackendNodePort, err := jig.GetDefaultBackendNodePort()
|
nodePorts := jig.GetIngressNodePorts(false)
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(len(nodePorts)).ToNot(Equal(0))
|
||||||
|
|
||||||
// Filter health check using cluster UID as the suffix.
|
// Filter health check using cluster UID as the suffix.
|
||||||
By("Retrieving relevant health check resources from GCE.")
|
By("Retrieving relevant health check resources from GCE.")
|
||||||
gceCloud := gceController.Cloud.Provider.(*gcecloud.GCECloud)
|
gceCloud := gceController.Cloud.Provider.(*gcecloud.GCECloud)
|
||||||
hcs, err := gceCloud.ListHealthChecks()
|
hcs, err := gceCloud.ListHealthChecks()
|
||||||
Expect(err).NotTo(HaveOccurred())
|
Expect(err).NotTo(HaveOccurred())
|
||||||
ingressHCs := []*compute.HealthCheck{}
|
var hcToChange *compute.HealthCheck
|
||||||
for _, hc := range hcs {
|
for _, hc := range hcs {
|
||||||
if strings.HasSuffix(hc.Name, clusterID) {
|
if strings.HasSuffix(hc.Name, clusterID) {
|
||||||
Expect(hc.HttpHealthCheck).ToNot(Equal(nil))
|
Expect(hc.HttpHealthCheck).NotTo(BeNil())
|
||||||
// Skip the default backend healthcheck as that shouldn't be customized.
|
if fmt.Sprintf("%d", hc.HttpHealthCheck.Port) == nodePorts[0] {
|
||||||
if hc.HttpHealthCheck.Port == int64(defaultBackendNodePort) {
|
hcToChange = hc
|
||||||
continue
|
break
|
||||||
}
|
}
|
||||||
ingressHCs = append(ingressHCs, hc)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Expect(hcToChange).NotTo(BeNil())
|
||||||
|
|
||||||
Expect(len(ingressHCs)).ToNot(Equal(0))
|
|
||||||
hcToChange := ingressHCs[0]
|
|
||||||
By(fmt.Sprintf("Modifying health check %v without involving ingress.", hcToChange.Name))
|
By(fmt.Sprintf("Modifying health check %v without involving ingress.", hcToChange.Name))
|
||||||
// Change timeout from 60s to 25s.
|
// Change timeout from 60s to 25s.
|
||||||
hcToChange.TimeoutSec = 25
|
hcToChange.TimeoutSec = 25
|
||||||
|
Loading…
Reference in New Issue
Block a user