rename flavor ownerreferences -> ownerrefs-finalizers

kubernetes-sigs · Jan 18, 2024 · 867f6f7 · 867f6f7
1 parent 2f118bb
commit 867f6f7
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -314,8 +314,7 @@ generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the mai
 	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/main/pci" > "$(E2E_TEMPLATE_DIR)/main/cluster-template-pci.yaml"
 	# for DHCP overrides
 	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/main/dhcp-overrides" > "$(E2E_TEMPLATE_DIR)/main/cluster-template-dhcp-overrides.yaml"
-	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/main/ownerreferences" > "$(E2E_TEMPLATE_DIR)/main/cluster-template-ownerreferences.yaml"
-	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/main/finalizers" > "$(E2E_TEMPLATE_DIR)/main/cluster-template-finalizers.yaml"
+	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build "$(E2E_TEMPLATE_DIR)/main/ownerrefs-finalizers" > "$(E2E_TEMPLATE_DIR)/main/cluster-template-ownerrefs-finalizers.yaml"
 
 .PHONY: generate-e2e-templates-v1.8
 generate-e2e-templates-v1.8: $(KUSTOMIZE)

diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml
@@ -148,8 +148,7 @@ providers:
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-kcp-remediation.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-md-remediation.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-node-drain.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-ownerreferences.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-finalizers.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-ownerrefs-finalizers.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-pci.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-remote-management.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-storage-policy.yaml"

diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml
@@ -151,8 +151,7 @@ providers:
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-kcp-remediation.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-md-remediation.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-node-drain.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-ownerreferences.yaml"
-          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-finalizers.yaml"
+          - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-ownerrefs-finalizers.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-pci.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-remote-management.yaml"
           - sourcePath: "../../../test/e2e/data/infrastructure-vsphere/main/cluster-template-storage-policy.yaml"

diff --git a/...ain/ownerreferences/cluster-identity.yaml → ...wnerrefs-finalizers/cluster-identity.yaml b/...ain/ownerreferences/cluster-identity.yaml → ...wnerrefs-finalizers/cluster-identity.yaml
@@ -2,9 +2,9 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereClusterIdentity
 metadata:
-  name: ownerreferences
+  name: ownerrefs-finalizers
 spec:
-  secretName: ownerreferences
+  secretName: ownerrefs-finalizers
   allowedNamespaces:
     selector:
       matchLabels:

diff --git a/...rences/drop-existing-identity-secret.yaml → ...lizers/drop-existing-identity-secret.yaml b/...rences/drop-existing-identity-secret.yaml → ...lizers/drop-existing-identity-secret.yaml
diff --git a/...main/ownerreferences/failure-domains.yaml → ...ownerrefs-finalizers/failure-domains.yaml b/...main/ownerreferences/failure-domains.yaml → ...ownerrefs-finalizers/failure-domains.yaml
@@ -2,7 +2,7 @@
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereFailureDomain
 metadata:
-  name: "ownerreferences"
+  name: ownerrefs-finalizers
 spec:
   region:
     name: '${VSPHERE_DATACENTER}'
@@ -23,9 +23,9 @@ spec:
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: VSphereDeploymentZone
 metadata:
-  name: "ownerreferences"
+  name: ownerrefs-finalizers
 spec:
   server: '${VSPHERE_SERVER}'
-  failureDomain: "ownerreferences"
+  failureDomain: "ownerrefs-finalizers"
   placementConstraint:
     resourcePool: '${VSPHERE_RESOURCE_POOL}'
diff --git a/...e/main/ownerreferences/kustomization.yaml → ...n/ownerrefs-finalizers/kustomization.yaml b/...e/main/ownerreferences/kustomization.yaml → ...n/ownerrefs-finalizers/kustomization.yaml
diff --git a/...nerreferences/vsphereclusteridentity.yaml → ...fs-finalizers/vsphereclusteridentity.yaml b/...nerreferences/vsphereclusteridentity.yaml → ...fs-finalizers/vsphereclusteridentity.yaml
@@ -7,5 +7,5 @@ metadata:
 spec:
   identityRef:
     kind: VSphereClusterIdentity
-    name: ownerreferences
+    name: ownerrefs-finalizers
 
diff --git a/test/e2e/finalizers_test.go b/test/e2e/finalizers_test.go
@@ -45,7 +45,7 @@ var _ = Describe("Check finalizers resiliency with DeploymentZone and ClusterIde
 			BootstrapClusterProxy: bootstrapClusterProxy,
 			ArtifactFolder:        artifactFolder,
 			SkipCleanup:           skipCleanup,
-			Flavor:                ptr.To("finalizers"),
+			Flavor:                ptr.To("ownerrefs-finalizers"),
 			PostMachinesProvisioned: func(proxy framework.ClusterProxy, namespace, clusterName string) {
 				// Set up a periodic patch to ensure the DeploymentZone is reconciled.
 				reconcileDeploymentZonePeriodically(ctx, proxy.GetClient())

diff --git a/test/e2e/ownerreference_test.go b/test/e2e/ownerreference_test.go
@@ -54,7 +54,7 @@ var _ = Describe("OwnerReference checks with FailureDomains and ClusterIdentity"
 			BootstrapClusterProxy: bootstrapClusterProxy,
 			ArtifactFolder:        artifactFolder,
 			SkipCleanup:           skipCleanup,
-			Flavor:                ptr.To("ownerreferences"),
+			Flavor:                ptr.To("ownerrefs-finalizers"),
 			PostMachinesProvisioned: func(proxy framework.ClusterProxy, namespace, clusterName string) {
 				// Inject a client to use for checkClusterIdentitySecretOwnerRef
 				checkClusterIdentitySecretOwnerRef(ctx, proxy.GetClient())
@@ -170,9 +170,9 @@ var (
 
 // The following names are hardcoded in templates to make cleanup easier.
 var (
-	clusterIdentityName            = "ownerreferences"
+	clusterIdentityName            = "ownerrefs-finalizers"
 	clusterIdentitySecretNamespace = "capv-system"
-	deploymentZoneName             = "ownerreferences"
+	deploymentZoneName             = "ownerrefs-finalizers"
 )
 
 // cleanupVSphereObjects deletes the Secret, VSphereClusterIdentity, and VSphereDeploymentZone created for this test.