Merge number of fernet keys configs

Use only one setting for the number of fernet keys.

Author: afaranha

api/bases/keystone.openstack.org_keystoneapis.yaml

@@ -115,11 +115,6 @@ spec:
                 description: NodeSelector to target subset of worker nodes running
                   this service
                 type: object
-              numberFernetKeys:
-                default: 2
-                description: Number of Fernet keys
-                format: int32
-                type: integer
               override:
                 description: Override, provides the ability to override the generated
                   manifest of several child resources.

api/v1beta1/keystoneapi_types.go

@@ -178,11 +178,6 @@ type KeystoneAPISpecCore struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// TLS - Parameters related to the TLS
 	TLS tls.API `json:"tls,omitempty"`
-
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default=2
-	// Number of Fernet keys
-	FernetKeys *int32 `json:"numberFernetKeys"`
 }
 
 // APIOverrideSpec to override the generated manifest of several child resources.

api/v1beta1/zz_generated.deepcopy.go

@@ -115,11 +115,6 @@ spec:
                 description: NodeSelector to target subset of worker nodes running
                   this service
                 type: object
-              numberFernetKeys:
-                default: 2
-                description: Number of Fernet keys
-                format: int32
-                type: integer
               override:
                 description: Override, provides the ability to override the generated
                   manifest of several child resources.

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

@@ -1386,9 +1386,10 @@ func (r *KeystoneAPIReconciler) ensureFernetKeys(
 			"CredentialKeys0": keystone.GenerateFernetKey(),
 			"CredentialKeys1": keystone.GenerateFernetKey(),
 		}
-		var i *int32 = new(int32)
-		for *i = 0; *i < *instance.Spec.FernetKeys; *i++ {
-			fernetKeys[fmt.Sprintf("FernetKeys%d", *i)] = keystone.GenerateFernetKey()
+		var numberKeys int
+		fmt.Sscan(instance.Spec.FernetMaxActiveKeys, &numberKeys)
+		for i := 0; i < numberKeys; i++ {
+			fernetKeys[fmt.Sprintf("FernetKeys%d", i)] = keystone.GenerateFernetKey()
 		}
 
 		tmpl := []util.Template{

controllers/keystoneapi_controller.go

@@ -137,7 +137,7 @@ func FernetCronJob(
 	completions := int32(1)
 
 	// create Volume and VolumeMounts
-	volumes := getVolumes(instance.Name)
+	volumes := getVolumes(keystoneapiinstance)
 	volumeMounts := getVolumeMounts()
 
 	cronjob := &batchv1.CronJob{

pkg/keystone/fernet.go

@@ -22,19 +22,27 @@ import (
 )
 
 // getVolumes - service volumes
-func getVolumes(instance *keystonev1.KeystoneAPI) []corev1.Volume {
-	name := instance.Name
+func getVolumes(keystoneapiinstance *keystonev1.KeystoneAPI) []corev1.Volume {
+	name := keystoneapiinstance.Name
 	var scriptsVolumeDefaultMode int32 = 0755
 	var config0640AccessMode int32 = 0640
 
+	instance := &keystonev1.KeystoneAPIFernet{KeystoneAPI: keystoneapiinstance}
+
 	fernetKeys := []corev1.KeyToPath{}
-	var i *int32 = new(int32)
-	for *i = 0; *i < *instance.Spec.FernetKeys; *i++ {
+
+	var numberKeys int
+	_, err := fmt.Sscan(instance.Spec.FernetMaxActiveKeys, &numberKeys)
+	if err != nil {
+		numberKeys = 5 // The default
+	}
+
+	for i := 0; i < numberKeys; i++ {
 		fernetKeys = append(
 			fernetKeys,
 			corev1.KeyToPath{
-				Key:  fmt.Sprintf("FernetKeys%d", *i),
-				Path: fmt.Sprintf("%d", *i),
+				Key:  fmt.Sprintf("FernetKeys%d", i),
+				Path: fmt.Sprintf("%d", i),
 			},
 		)
 	}