Update tests to work with Kubebuilder 2.

Author: brownleej

api/v1beta1/foundationdbcluster_types.go

@@ -32,6 +32,10 @@ import (
 )
 
 // +kubebuilder:object:root=true
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Generation",type="integer",JSONPath=".metadata.generation",description="Latest generation of the spec",priority=0
+// +kubebuilder:printcolumn:name="Reconciled",type="integer",JSONPath=".status.generations.reconciled",description="Last reconciled generation of the spec",priority=0
+// +kubebuilder:printcolumn:name="Healthy",type="boolean",JSONPath=".status.health.healthy",description="Database health",priority=0
 
 // FoundationDBCluster is the Schema for the foundationdbclusters API
 type FoundationDBCluster struct {
@@ -837,7 +841,7 @@ func (cluster *FoundationDBCluster) GetFullAddressList(ipAddress string, primary
 		addressMap[fmt.Sprintf("%s:4501", ipAddress)] = !cluster.Spec.MainContainer.EnableTLS
 	}
 
-	addresses := make([]string, 1, len(addressMap))
+	addresses := make([]string, 1, 1+len(addressMap))
 	for address, primary := range addressMap {
 		if primary {
 			addresses[0] = address

api/v1beta1/zz_generated.deepcopy.go

@@ -8,13 +8,28 @@ metadata:
   creationTimestamp: null
   name: foundationdbclusters.apps.foundationdb.org
 spec:
+  additionalPrinterColumns:
+  - JSONPath: .metadata.generation
+    description: Latest generation of the spec
+    name: Generation
+    type: integer
+  - JSONPath: .status.generations.reconciled
+    description: Last reconciled generation of the spec
+    name: Reconciled
+    type: integer
+  - JSONPath: .status.health.healthy
+    description: Database health
+    name: Healthy
+    type: boolean
   group: apps.foundationdb.org
   names:
     kind: FoundationDBCluster
     listKind: FoundationDBClusterList
     plural: foundationdbclusters
     singular: foundationdbcluster
   scope: Namespaced
+  subresources:
+    status: {}
   validation:
     openAPIV3Schema:
       description: FoundationDBCluster is the Schema for the foundationdbclusters

config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml

@@ -335,7 +335,7 @@ type MockAdminClient struct {
 	KubeClient            client.Client
 	DatabaseConfiguration *fdbtypes.DatabaseConfiguration
 	ExcludedAddresses     []string
-	ReincludedAddresses   []string
+	ReincludedAddresses   map[string]bool
 	KilledAddresses       []string
 	frozenStatus          *fdbtypes.FoundationDBStatus
 }
@@ -352,7 +352,11 @@ func NewMockAdminClient(cluster *fdbtypes.FoundationDBCluster, kubeClient client
 func newMockAdminClientUncast(cluster *fdbtypes.FoundationDBCluster, kubeClient client.Client) (*MockAdminClient, error) {
 	client := adminClientCache[cluster.Name]
 	if client == nil {
-		client = &MockAdminClient{Cluster: cluster, KubeClient: kubeClient}
+		client = &MockAdminClient{
+			Cluster:             cluster,
+			KubeClient:          kubeClient,
+			ReincludedAddresses: make(map[string]bool),
+		}
 		adminClientCache[cluster.Name] = client
 	} else {
 		client.Cluster = cluster
@@ -371,7 +375,7 @@ func (client *MockAdminClient) GetStatus() (*fdbtypes.FoundationDBStatus, error)
 		return client.frozenStatus, nil
 	}
 	pods := &corev1.PodList{}
-	err := client.KubeClient.List(context.TODO(), pods, nil)
+	err := client.KubeClient.List(context.TODO(), pods)
 	if err != nil {
 		return nil, err
 	}
@@ -478,7 +482,7 @@ func (client *MockAdminClient) IncludeInstances(addresses []string) error {
 		for _, address := range addresses {
 			if address == excludedAddress {
 				included = true
-				client.ReincludedAddresses = append(client.ReincludedAddresses, address)
+				client.ReincludedAddresses[address] = true
 				break
 			}
 		}

controllers/admin_client.go

@@ -122,6 +122,9 @@ func (r *FoundationDBClusterReconciler) Reconcile(request ctrl.Request) (ctrl.Re
 		if err != nil {
 			log.Error(err, "Error in reconciliation", "subReconciler", fmt.Sprintf("%T", subReconciler), "namespace", cluster.Namespace, "cluster", cluster.Name)
 			return r.checkRetryableError(err)
+		} else if cluster.ObjectMeta.Generation != originalGeneration {
+			log.Info("Ending reconciliation early because cluster has been updated")
+			return ctrl.Result{}, nil
 		} else if !canContinue {
 			log.Info("Requeuing reconciliation", "subReconciler", fmt.Sprintf("%T", subReconciler), "namespace", cluster.Namespace, "cluster", cluster.Name)
 			return ctrl.Result{Requeue: true, RequeueAfter: subReconciler.RequeueAfter()}, nil
@@ -139,6 +142,14 @@ func (r *FoundationDBClusterReconciler) Reconcile(request ctrl.Request) (ctrl.Re
 }
 
 func (r *FoundationDBClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
+	mgr.GetFieldIndexer().IndexField(&corev1.Pod{}, "metadata.name", func(o runtime.Object) []string {
+		return []string{o.(*corev1.Pod).Name}
+	})
+
+	mgr.GetFieldIndexer().IndexField(&corev1.PersistentVolumeClaim{}, "metadata.name", func(o runtime.Object) []string {
+		return []string{o.(*corev1.PersistentVolumeClaim).Name}
+	})
+
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&fdbtypes.FoundationDBCluster{}).
 		Complete(r)