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

Fix possible host name clash in tests #430

Merged
merged 1 commit into from
Apr 8, 2021
Merged

Fix possible host name clash in tests #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion terratest/examples/broken-gslb-no-http.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
ingress:
rules:
- host: terratest-failover.cloud.example.com
- host: broken-no-http.cloud.example.com
strategy:
type: failover
primaryGeoTag: eu
4 changes: 2 additions & 2 deletions terratest/examples/broken-gslb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: k8gb.absa.oss/v1beta1
kind: Gslb
metadata:
name: broken-test-gslb1
name: broken-test-gslb2
spec:
ingress:
rules:
- host: terratest-failover.cloud.example.com
- host: terratest-broken.cloud.example.com
https:
paths:
- backend:
Expand Down
4 changes: 2 additions & 2 deletions terratest/examples/failover-spec.yaml → terratest/examples/failover-lifecycle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: k8gb.absa.oss/v1beta1
kind: Gslb
metadata:
name: test-gslb-failover-simple
name: test-gslb-lifecycle
spec:
ingress:
rules:
- host: terratest-failover.cloud.example.com
- host: lifecycle.cloud.example.com
http:
paths:
- backend:
Expand Down
4 changes: 2 additions & 2 deletions terratest/test/k8gb_lifecycle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func TestK8gbRepeatedlyRecreatedFromIngress(t *testing.T) {
func TestK8gbSpecKeepsStableAfterIngressUpdates(t *testing.T) {
t.Parallel()
// name of ingress and gslb
const name = "test-gslb-failover-simple"
const name = "test-gslb-lifecycle"

assertStrategy := func(t *testing.T, options *k8s.KubectlOptions) {
assertGslbSpec(t, options, name, "spec.strategy.splitBrainThresholdSeconds", "600")
Expand All @@ -109,7 +109,7 @@ func TestK8gbSpecKeepsStableAfterIngressUpdates(t *testing.T) {
assertGslbSpec(t, options, name, "spec.strategy.type", "failover")
}

kubeResourcePath, err := filepath.Abs("../examples/failover-spec.yaml")
kubeResourcePath, err := filepath.Abs("../examples/failover-lifecycle.yaml")
ingressResourcePath, err := filepath.Abs("../examples/ingress-annotation-failover.yaml")
require.NoError(t, err)
// To ensure we can reuse the resource config on the same cluster to test different scenarios, we setup a unique
Expand Down