fix of retain functionality

.github/workflows/main.yml

@@ -199,10 +199,10 @@ jobs:
 
       - name: Test deployments are ready
         run: |
-          kubectl wait --for=condition=available deployment/trillian-db -n test --timeout=30s
-          kubectl wait --for=condition=available deployment/trillian-logserver -n test --timeout=30s
-          kubectl wait --for=condition=available deployment/trillian-logsigner -n test --timeout=30s
-          kubectl wait --for=condition=available deployment/fulcio-server -n test --timeout=30s
+          kubectl wait --for=condition=available deployment/trillian-db -n test --timeout=60s
+          kubectl wait --for=condition=available deployment/trillian-logserver -n test --timeout=60s
+          kubectl wait --for=condition=available deployment/trillian-logsigner -n test --timeout=60s
+          kubectl wait --for=condition=available deployment/fulcio-server -n test --timeout=60s
 
       - name: Until shell script to wait for tuf, ctlog, rekor-redis, rekor-server deployment to be created
         run: |
@@ -218,10 +218,10 @@ jobs:
 
       - name: Test deployments are ready
         run: |
-          kubectl wait --for=condition=available deployment/tuf -n test --timeout=30s
-          kubectl wait --for=condition=available deployment/ctlog -n test --timeout=30s
-          kubectl wait --for=condition=available deployment/rekor-redis -n test --timeout=30s
-          kubectl wait --for=condition=available deployment/rekor-server -n test --timeout=30s
+          kubectl wait --for=condition=available deployment/tuf -n test --timeout=60s
+          kubectl wait --for=condition=available deployment/ctlog -n test --timeout=60s
+          kubectl wait --for=condition=available deployment/rekor-redis -n test --timeout=60s
+          kubectl wait --for=condition=available deployment/rekor-server -n test --timeout=60s
 
       - name: dump the logs of the operator
         run: kubectl logs -n openshift-rhtas-operator deployment/rhtas-operator-controller-manager

api/v1alpha1/common.go

@@ -31,7 +31,7 @@ type Pvc struct {
 	Size string `json:"size,omitempty"`
 	// Retain policy for the PVC
 	//+kubebuilder:default:=true
-	Retain bool `json:"retain,omitempty"`
+	Retain bool `json:"retain"`
 	// Name of the PVC
 	//+optional
 	Name string `json:"name,omitempty"`

api/v1alpha1/rekor_types.go

@@ -20,6 +20,7 @@ type RekorSpec struct {
 	// Signer configuration
 	Signer RekorSigner `json:"signer,omitempty"`
 	// PVC configuration
+	//+kubebuilder:default:={size: "5Gi", retain: true}
 	Pvc Pvc `json:"pvc,omitempty"`
 	// BackFillRedis CronJob Configuration
 	BackFillRedis BackFillRedis `json:"backFillRedis,omitempty"`

api/v1alpha1/trillian_types.go

@@ -24,7 +24,6 @@ import (
 // TrillianSpec defines the desired state of Trillian
 type TrillianSpec struct {
 	// Define your database connection
-	//+kubebuilder:default:={create:true,pvc:{retain:true,size:"5Gi"}}
 	Db TrillianDB `json:"database,omitempty"`
 }
 
@@ -36,7 +35,7 @@ type TrillianDB struct {
 	//+optional
 	DatabaseSecretRef *v1.LocalObjectReference `json:"databaseSecretRef,omitempty"`
 	// PVC configuration
-	//+kubebuilder:default:={retain:true, size:"5Gi"}
+	//+kubebuilder:default:={size: "5Gi", retain: true}
 	Pvc Pvc `json:"pvc,omitempty"`
 }
 

config/crd/bases/rhtas.redhat.com_rekors.yaml

@@ -76,6 +76,9 @@ spec:
                     type: boolean
                 type: object
               pvc:
+                default:
+                  retain: true
+                  size: 5Gi
                 description: PVC configuration
                 properties:
                   name:
@@ -92,6 +95,8 @@ spec:
                   storageClass:
                     description: Storage class for the PVC
                     type: string
+                required:
+                - retain
                 type: object
               rekorSearchUI:
                 description: Rekor Search UI

config/crd/bases/rhtas.redhat.com_securesigns.yaml

@@ -328,6 +328,9 @@ spec:
                         type: boolean
                     type: object
                   pvc:
+                    default:
+                      retain: true
+                      size: 5Gi
                     description: PVC configuration
                     properties:
                       name:
@@ -344,6 +347,8 @@ spec:
                       storageClass:
                         description: Storage class for the PVC
                         type: string
+                    required:
+                    - retain
                     type: object
                   rekorSearchUI:
                     description: Rekor Search UI
@@ -400,11 +405,6 @@ spec:
                 description: TrillianSpec defines the desired state of Trillian
                 properties:
                   database:
-                    default:
-                      create: true
-                      pvc:
-                        retain: true
-                        size: 5Gi
                     description: Define your database connection
                     properties:
                       create:
@@ -442,6 +442,8 @@ spec:
                           storageClass:
                             description: Storage class for the PVC
                             type: string
+                        required:
+                        - retain
                         type: object
                     required:
                     - create

config/crd/bases/rhtas.redhat.com_trillians.yaml

@@ -41,11 +41,6 @@ spec:
             description: TrillianSpec defines the desired state of Trillian
             properties:
               database:
-                default:
-                  create: true
-                  pvc:
-                    retain: true
-                    size: 5Gi
                 description: Define your database connection
                 properties:
                   create:
@@ -83,6 +78,8 @@ spec:
                       storageClass:
                         description: Storage class for the PVC
                         type: string
+                    required:
+                    - retain
                     type: object
                 required:
                 - create

controllers/trillian/actions/db/pvc.go

@@ -39,8 +39,10 @@ func (i createPvcAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Tri
 	// PVC does not exist, create a new one
 	i.Logger.V(1).Info("Creating new PVC")
 	pvc := k8sutils.CreatePVC(instance.Namespace, actions.DbPvcName, instance.Spec.Db.Pvc.Size, instance.Spec.Db.Pvc.StorageClass, constants.LabelsFor(actions.DbComponentName, actions.DbDeploymentName, instance.Name))
-	if err = controllerutil.SetControllerReference(instance, pvc, i.Client.Scheme()); err != nil {
-		return i.Failed(fmt.Errorf("could not set controller reference for PVC: %w", err))
+	if !instance.Spec.Db.Pvc.Retain {
+		if err = controllerutil.SetControllerReference(instance, pvc, i.Client.Scheme()); err != nil {
+			return i.Failed(fmt.Errorf("could not set controller reference for PVC: %w", err))
+		}
 	}
 	if _, err = i.Ensure(ctx, pvc); err != nil {
 		meta.SetStatusCondition(&instance.Status.Conditions, metav1.Condition{