Mount variable number of fernet keys

Add code to translate mount paths for variable
number of fernet keys.

Author: afaranha

api/bases/keystone.openstack.org_keystoneapis.yaml

@@ -105,6 +105,11 @@ 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.
@@ -365,10 +370,6 @@ spec:
                 description: Secret containing OpenStack password information for
                   keystone AdminPassword
                 type: string
-              numberFernetKeys:
-                default: 2
-                description: Number of Fernet keys
-                type: integer
               tls:
                 description: TLS - Parameters related to the TLS
                 properties:

api/v1beta1/zz_generated.deepcopy.go

@@ -105,6 +105,11 @@ 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.
@@ -365,10 +370,6 @@ spec:
                 description: Secret containing OpenStack password information for
                   keystone AdminPassword
                 type: string
-              numberFernetKeys:
-                default: 2
-                description: Number of Fernet keys
-                type: integer
               tls:
                 description: TLS - Parameters related to the TLS
                 properties:

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

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

controllers/keystoneapi_controller.go

@@ -16,6 +16,8 @@ limitations under the License.
 package keystone
 
 import (
+	"fmt"
+	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -26,8 +28,15 @@ func getVolumes(instance *keystonev1.KeystoneAPI) []corev1.Volume {
 	var config0640AccessMode int32 = 0640
 
 	fernetKeys := []corev1.KeyToPath{}
-	for i := range instance.Spec.FernetKeys {
-		fernetKeys = append(fernetKeys, fmt.Sprintf("FernetKeys%d", i))
+	var i *int32 = new(int32)
+	for *i = 0; *i < *instance.Spec.FernetKeys; *i++ {
+		fernetKeys = append(
+			fernetKeys,
+			corev1.KeyToPath{
+				Key:  fmt.Sprintf("FernetKeys%d", *i),
+				Path: fmt.Sprintf("%d", *i),
+			},
+		)
 	}
 
 	return []corev1.Volume{
@@ -54,7 +63,7 @@ func getVolumes(instance *keystonev1.KeystoneAPI) []corev1.Volume {
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
 					SecretName: ServiceName,
-					Items: fernetKeys,
+					Items:      fernetKeys,
 				},
 			},
 		},