fix tests

hashicorp · Dec 8, 2021 · ed81558 · ed81558
1 parent b4a0b5a
commit ed81558
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -70,7 +70,7 @@ commands:
         type: string
       consul-k8s-image:
         type: string
-        default: "ashwinvenkatesh/consul-k8s@sha256:ca2bde89a28563d40100039c217df6f750cc8b3bd72b31036bb1aaaff74f23fc"
+        default: "ashwinvenkatesh/consul-k8s@sha256:5cccabeb3d5dfe4497279d5aebdaf363f3e96cdca9cfd1a0a005a75837d8fb63"
       go-path:
         type: string
         default: "/home/circleci/.go_workspace"

diff --git a/...-partitions/exportedservices-default.yaml → ...ces-default/exportedservices-default.yaml b/...-partitions/exportedservices-default.yaml → ...ces-default/exportedservices-default.yaml
diff --git a/acceptance/tests/fixtures/bases/exportedservices-default/kustomization.yaml b/acceptance/tests/fixtures/bases/exportedservices-default/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+  - exportedservices-default.yaml
diff --git a/...artitions/exportedservices-secondary.yaml → ...secondary/exportedservices-secondary.yaml b/...artitions/exportedservices-secondary.yaml → ...secondary/exportedservices-secondary.yaml
diff --git a/...bases/admin-partitions/kustomization.yaml → ...rtedservices-secondary/kustomization.yaml b/...bases/admin-partitions/kustomization.yaml → ...rtedservices-secondary/kustomization.yaml
@@ -1,3 +1,2 @@
 resources:
-  - exportedservices-default.yaml
   - exportedservices-secondary.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-partitions/default-partition-default/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - ../../../bases/admin-partitions
+  - ../../../bases/exportedservices-default
 
 patchesStrategicMerge:
 - patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-partitions/default-partition-ns1/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - ../../../bases/admin-partitions
+  - ../../../bases/exportedservices-default
 
 patchesStrategicMerge:
 - patch.yaml
diff --git a/...ptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml b/...ptance/tests/fixtures/cases/crd-partitions/secondary-partition-default/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - ../../../bases/admin-partitions
+  - ../../../bases/exportedservices-secondary
 
 patchesStrategicMerge:
 - patch.yaml
diff --git a/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml b/acceptance/tests/fixtures/cases/crd-partitions/secondary-partition-ns1/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-  - ../../../bases/admin-partitions
+  - ../../../bases/exportedservices-secondary
 
 patchesStrategicMerge:
 - patch.yaml
diff --git a/acceptance/tests/partitions/partitions_test.go b/acceptance/tests/partitions/partitions_test.go
@@ -96,7 +96,7 @@ func TestPartitions(t *testing.T) {
 
 			serverHelmValues := map[string]string{
 				"global.datacenter": "dc1",
-				"global.image":      "hashicorp/consul-enterprise:1.11.0-ent-beta3",
+				"global.image":      "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296",
 
 				"global.adminPartitions.enabled": "true",
 				"global.enableConsulNamespaces":  "true",
@@ -192,7 +192,7 @@ func TestPartitions(t *testing.T) {
 			// Create client cluster.
 			clientHelmValues := map[string]string{
 				"global.datacenter": "dc1",
-				"global.image":      "hashicorp/consul-enterprise:1.11.0-ent-beta3",
+				"global.image":      "ashwinvenkatesh/consul@sha256:dce7a25b9e15271d8102a0f14fae71af0b9c789bafd8cbe4a7d0f8c34abe0296",
 				"global.enabled":    "false",
 
 				"global.tls.enabled":           "true",
@@ -535,7 +535,7 @@ func TestPartitions(t *testing.T) {
 				require.NoError(t, err)
 				require.Len(t, services, 1)
 
-				logger.Log(t, "creating partition exports")
+				logger.Log(t, "creating exported services")
 				if c.destinationNamespace == defaultNamespace {
 					k8s.KubectlApplyK(t, serverClusterContext.KubectlOptions(t), "../fixtures/cases/crd-partitions/default-partition-default")
 					k8s.KubectlApplyK(t, clientClusterContext.KubectlOptions(t), "../fixtures/cases/crd-partitions/secondary-partition-default")