Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: Switch target FQDN #25571

Merged
merged 2 commits into from May 21, 2023
Merged

test: Switch target FQDN #25571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3037c0d
test/fqdn: Avoid hardcoding the test FQDN
pchaigno May 21, 2023
2ac6ba7
test/fqdn: Switch from jenkins.cilium.io to cilium.io
pchaigno May 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions test/k8s/fqdn.go
View file
Open in desktop
Expand Up @@ -26,36 +26,36 @@ var _ = SkipDescribeIf(helpers.RunsOn54Kernel, "K8sAgentFQDNTest", func() {
appPods map[string]string

// The IPs are updated in BeforeAll
worldTarget = "http://vagrant-cache.ci.cilium.io"
worldTarget = "vagrant-cache.ci.cilium.io"
worldTargetIP = "147.75.38.95"
worldInvalidTarget = "http://jenkins.cilium.io"
worldInvalidTarget = "cilium.io"
worldInvalidTargetIP = "104.198.14.52"
)

BeforeAll(func() {
// In case the IPs changed from above, update them here
var lookupErr error
err := helpers.WithTimeout(func() bool {
addrs, err2 := net.LookupHost("vagrant-cache.ci.cilium.io")
addrs, err2 := net.LookupHost(worldTarget)
if err2 != nil {
lookupErr = fmt.Errorf("error looking up vagrant-cache.ci.cilium.io: %s", err2)
lookupErr = fmt.Errorf("error looking up target domain: %s", err2)
return false
}
worldTargetIP = addrs[0]
return true
}, "Could not get vagrant-cache.ci.cilium.io IP", &helpers.TimeoutConfig{Timeout: helpers.HelperTimeout})
}, fmt.Sprintf("Could not get %s IP", worldTarget), &helpers.TimeoutConfig{Timeout: helpers.HelperTimeout})
Expect(err).Should(BeNil(), "Error obtaining IP for test: %s", lookupErr)

lookupErr = nil
err = helpers.WithTimeout(func() bool {
addrs, err2 := net.LookupHost("jenkins.cilium.io")
addrs, err2 := net.LookupHost(worldInvalidTarget)
if err2 != nil {
lookupErr = fmt.Errorf("error looking up jenkins.cilium.io: %s", err2)
lookupErr = fmt.Errorf("error looking up target domain: %s", err2)
return false
}
worldInvalidTargetIP = addrs[0]
return true
}, "Could not get jenkins.cilium.io IP", &helpers.TimeoutConfig{Timeout: helpers.HelperTimeout})
}, fmt.Sprintf("Could not get %s IP", worldInvalidTarget), &helpers.TimeoutConfig{Timeout: helpers.HelperTimeout})
Expect(err).Should(BeNil(), "Error obtaining IP for test: %s", lookupErr)

kubectl = helpers.CreateKubectl(helpers.K8s1VMName(), logger)
Expand Down
2 changes: 1 addition & 1 deletion test/k8s/manifests/fqdn-proxy-multiple-specs-v2.yaml
View file
Open in desktop
Expand Up @@ -27,7 +27,7 @@ specs:
dns:
- matchPattern: "*"
- toFQDNs:
- matchPattern: "jenkins.cilium.io"
- matchPattern: "cilium.io"
endpointSelector:
matchLabels:
id: app3
Expand Down
2 changes: 1 addition & 1 deletion test/k8s/manifests/fqdn-proxy-multiple-specs.yaml
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ specs:
dns:
- matchPattern: "*"
- toFQDNs:
- matchPattern: "jenkins.cilium.io"
- matchPattern: "cilium.io"
endpointSelector:
matchLabels:
id: app3