Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion test/extended/cli/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ var _ = g.Describe("[sig-cli] oc adm", func() {
o.Expect(err).NotTo(o.HaveOccurred())
for _, m := range masters.Items {
if hostname, ok := m.Labels["kubernetes.io/hostname"]; ok {
o.Expect(out).To(o.ContainSubstring(hostname))
// Extract short hostname from FQDN (e.g., "ip-10-0-88-44.ec2.internal" -> "ip-10-0-88-44").
// The node-logs will contains the normal hostname, but the FQDN isn't guaranteed.
shortHostname := strings.Split(hostname, ".")[0]
o.Expect(out).To(o.ContainSubstring(shortHostname))
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/extended/networking/egress_firewall.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ func sendEgressFwTraffic(f *e2e.Framework, mgmtFw *e2e.Framework, oc *exutil.CLI
// Test ICMP / Ping to Cloudfare DNS IP (1.1.1.1) should fail
// because there is no allow cidr match for 1.1.1.1
g.By("sending traffic that does not match allow cidr rule")
_, err = oc.Run("exec").Args(pod, "--", "ping", "-c", "1", "1.1.1.1").Output()
expectError(err)
out, err := oc.Run("exec").Args(pod, "--", "ping", "-c", "1", "1.1.1.1").Output()
expectError(err, "ping to 1.1.1.1 should fail: %s", out)
}
// Test curl to redhat.com should pass
// because we have allow dns rule for redhat.com
Expand Down