Review fixes

Makefile

@@ -297,11 +297,6 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 		paths=./test/infrastructure/vcsim/controllers/... \
 		output:rbac:dir=$(VCSIM_RBAC_ROOT) \
 		rbac:roleName=manager-role
-	# rbac for capv-janitor
-	$(CONTROLLER_GEN) \
-		paths=$(JANITOR_DIR) \
-		output:rbac:dir=$(JANITOR_DIR)/config/rbac \
-		rbac:roleName=janitor-role
 
 .PHONY: generate-go-deepcopy
 generate-go-deepcopy: $(CONTROLLER_GEN) ## Generate deepcopy go code for core
@@ -762,6 +757,19 @@ clean-bin: ## Remove all generated binaries
 	rm -rf $(BIN_DIR)
 	rm -rf $(TOOLS_BIN_DIR)
 
+.PHONY: clean-ci
+clean-ci: ## Cleanup orphaned objects in CI
+	@if [ -z "${GOVC_USERNAME}" ]; then echo "GOVC_USERNAME is not set"; exit 1; fi
+	@if [ -z "${GOVC_PASSWORD}" ]; then echo "GOVC_PASSWORD is not set"; exit 1; fi
+	@if [ -z "${GOVC_URL}" ]; then echo "GOVC_URL is not set"; exit 1; fi
+	go run $(JANITOR_DIR) \
+		--dry-run=false \
+		--max-age=12h \
+		--ipam-namespace=default \
+		--folder=/SDDC-Datacenter/vm/Workloads/cluster-api-provider-vsphere \
+		--folder=/SDDC-Datacenter/vm/Workloads/cloud-provider-vsphere \
+		--folder=/SDDC-Datacenter/vm/Workloads/image-builder
+
 .PHONY: clean-temporary
 clean-temporary: ## Remove all temporary files and folders
 	rm -f minikube.kubeconfig

hack/tools/janitor/README.md

@@ -1,32 +1,10 @@
 # janitor
 
 The janitor is a tool for CI to cleanup objects leftover from failed or killed prowjobs.
-It can be run regularily as cronjob.
+It can be run regularly as prowjob.
 
 It tries to delete:
 
 * vSphere: virtual machines in the configured folders which exist longer than the configured `--max-age` flag.
 * vSphere: cluster modules which do not refer any virtual machine
 * IPAM: IPAddressClaims which exist longer than the configured `--max-age` flag
-
-## Deployment
-
-1. (Optional:) Build and push image:
-
-  ```sh
-  cd hack/tools/janitor
-  make build push
-  ```
-
-2. Deploy using kustomize and envsubst:
-
-  ```sh
-  export 
-  export VSPHERE_SERVER=""
-  export VSPHERE_USERNAME=""
-  export VSPHERE_PASSWORD=""
-  export VSPHERE_TLS_THUMBPRINT=""
-
-  cd hack/tools/janitor
-  kustomize build config/default | envsubst  | kubectl apply -f -
-  ```

hack/tools/janitor/janitor.go

@@ -34,12 +34,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func newJanitor(vSphereClients *vSphereClients, ipamClient client.Client, delta time.Duration, ipamNamespace string, dryRun bool) *janitor {
+func newJanitor(vSphereClients *vSphereClients, ipamClient client.Client, maxAge time.Duration, ipamNamespace string, dryRun bool) *janitor {
 	return &janitor{
 		dryRun:          dryRun,
 		ipamClient:      ipamClient,
 		ipamNamespace:   ipamNamespace,
-		maxCreationDate: time.Now().Add(-delta),
+		maxCreationDate: time.Now().Add(-maxAge),
 		vSphereClients:  vSphereClients,
 	}
 }
@@ -57,9 +57,9 @@ type virtualMachine struct {
 	object        *object.VirtualMachine
 }
 
-// vSphereVMs deletes all vSphereVMs in a given folder in vSphere if their creation
+// deleteVSphereVMs deletes all deleteVSphereVMs in a given folder in vSphere if their creation
 // timestamp is before the janitor's configured maxCreationDate.
-func (s *janitor) vSphereVMs(ctx context.Context, folder string) error {
+func (s *janitor) deleteVSphereVMs(ctx context.Context, folder string) error {
 	log := ctrl.LoggerFrom(ctx).WithName("vSphereVMs").WithValues("folder", folder)
 	ctx = ctrl.LoggerInto(ctx, log)
 
@@ -124,6 +124,7 @@ func (s *janitor) vSphereVMs(ctx context.Context, folder string) error {
 		if err != nil {
 			return err
 		}
+		log.Info("Created PowerOff task for VM", "vm", vm.managedObject.Config.Name, "task", task.Name())
 		poweroffTasks = append(poweroffTasks, task)
 	}
 	// Wait for all PowerOff tasks to be finished. We intentionally ignore errors here
@@ -144,11 +145,12 @@ func (s *janitor) vSphereVMs(ctx context.Context, folder string) error {
 		if err != nil {
 			return err
 		}
+		log.Info("Created Destroy task for VM", "vm", vm.managedObject.Config.Name, "task", task.Name())
 		destroyTasks = append(destroyTasks, task)
 	}
 	// Wait for all destroy tasks to succeed.
 	if err := waitForTasksFinished(ctx, destroyTasks, false); err != nil {
-		return errors.Wrap(err, "failed to wait for vm poweroff task to finish")
+		return errors.Wrap(err, "failed to wait for vm destroy task to finish")
 	}
 
 	return nil
@@ -163,9 +165,7 @@ func waitForTasksFinished(ctx context.Context, tasks []*object.Task, ignoreError
 	return nil
 }
 
-// +kubebuilder:rbac:groups=ipam.cluster.x-k8s.io,resources=ipaddressclaims,verbs=get;list;watch;delete
-
-func (s *janitor) ipAddressClaims(ctx context.Context) error {
+func (s *janitor) deleteIPAddressClaims(ctx context.Context) error {
 	log := ctrl.LoggerFrom(ctx).WithName("IPAddressClaims")
 	ctrl.LoggerInto(ctx, log)
 	log.Info("Deleting IPAddressClaims")
@@ -202,7 +202,7 @@ func (s *janitor) ipAddressClaims(ctx context.Context) error {
 	return kerrors.NewAggregate(errList)
 }
 
-func (s *janitor) vSphereClusterModules(ctx context.Context) error {
+func (s *janitor) deleteVSphereClusterModules(ctx context.Context) error {
 	log := ctrl.LoggerFrom(ctx).WithName("vSphere cluster modules")
 	ctrl.LoggerInto(ctx, log)
 	log.Info("Deleting vSphere cluster modules")