Change type of FernetMaxActiveKeys to int

Author: xek

api/bases/keystone.openstack.org_keystoneapis.yaml

@@ -90,10 +90,11 @@ spec:
                   policies
                 type: boolean
               fernetMaxActiveKeys:
-                default: "5"
+                default: 5
                 description: FernetMaxActiveKeys - Maximum number of fernet token
                   keys after rotation
-                type: string
+                format: int32
+                type: integer
               fernetRotationContainerImage:
                 description: Keystone Fernet Rotation Container Image URL (will be
                   set to environmental default if empty)

api/v1beta1/keystoneapi_types.go

@@ -131,9 +131,9 @@ type KeystoneAPISpecCore struct {
 	FernetRotationSchedule string `json:"fernetRotationSchedule"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default="5"
+	// +kubebuilder:default=5
 	// FernetMaxActiveKeys - Maximum number of fernet token keys after rotation
-	FernetMaxActiveKeys string `json:"fernetMaxActiveKeys"`
+	FernetMaxActiveKeys *int32 `json:"fernetMaxActiveKeys"`
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={admin: AdminPassword}

api/v1beta1/zz_generated.deepcopy.go

@@ -90,10 +90,11 @@ spec:
                   policies
                 type: boolean
               fernetMaxActiveKeys:
-                default: "5"
+                default: 5
                 description: FernetMaxActiveKeys - Maximum number of fernet token
                   keys after rotation
-                type: string
+                format: int32
+                type: integer
               fernetRotationContainerImage:
                 description: Keystone Fernet Rotation Container Image URL (will be
                   set to environmental default if empty)

config/crd/bases/keystone.openstack.org_keystoneapis.yaml

@@ -1378,12 +1378,7 @@ func (r *KeystoneAPIReconciler) ensureFernetKeys(
 	// check if secret already exist
 	//
 	secretName := keystone.ServiceName
-
-	var numberKeys int
-	_, err := fmt.Sscan(instance.Spec.FernetMaxActiveKeys, &numberKeys)
-	if err != nil {
-		return err
-	}
+	numberKeys := int(*instance.Spec.FernetMaxActiveKeys)
 
 	secret, hash, err := oko_secret.GetSecret(ctx, helper, secretName, instance.Namespace)
 

controllers/keystoneapi_controller.go

@@ -17,8 +17,8 @@ package keystone
 
 import (
 	"encoding/base64"
-
 	"math/rand"
+	"strconv"
 
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
@@ -112,7 +112,7 @@ func FernetCronJob(
 	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
 	envVars["SECRET_NAME"] = env.SetValue(ServiceName)
 	envVars["MAX_ACTIVE_KEYS"] = env.SetValue(
-		instance.Spec.FernetMaxActiveKeys)
+		strconv.Itoa(int(*instance.Spec.FernetMaxActiveKeys)))
 
 	backoffLimit := int32(0)
 	parallelism := int32(1)

pkg/keystone/fernet.go

@@ -30,12 +30,7 @@ func getVolumes(keystoneapiinstance *keystonev1.KeystoneAPI) []corev1.Volume {
 	instance := &keystonev1.KeystoneAPIFernet{KeystoneAPI: keystoneapiinstance}
 
 	fernetKeys := []corev1.KeyToPath{}
-
-	var numberKeys int
-	_, err := fmt.Sscan(instance.Spec.FernetMaxActiveKeys, &numberKeys)
-	if err != nil {
-		numberKeys = 5 // The default
-	}
+	numberKeys := int(*instance.Spec.FernetMaxActiveKeys)
 
 	for i := 0; i < numberKeys; i++ {
 		fernetKeys = append(