Replace hardcoded FSGroup (1000) with property

Orange-OpenSource · Jan 12, 2021 · a1ef5ef · a1ef5ef
1 parent 6756286
commit a1ef5ef
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/api/v1alpha1/nificluster_types.go b/api/v1alpha1/nificluster_types.go
@@ -190,6 +190,9 @@ type NodeConfig struct {
 	//RunAsUser define the id of the user to run in the Nifi image
 	// +kubebuilder:validation:Minimum=1
 	RunAsUser *int64 `json:"runAsUser,omitempty"`
+	//FSGroup define the id of the group for each volumes in Nifi image
+	// +kubebuilder:validation:Minimum=1
+	FSGroup *int64 `json:"FSGroup,omitempty"`
 	// Set this to true if the instance is a node in a cluster.
 	// https://nifi.apache.org/docs/nifi-docs/html/administration-guide.html#basic-cluster-setup
 	IsNode *bool `json:"isNode,omitempty"`
@@ -543,6 +546,16 @@ func (nConfig *NodeConfig) GetRunAsUser() *int64 {
 	return func(i int64) *int64 { return &i }(defaultUserID)
 }
 
+//
+func (nConfig *NodeConfig) GetFSGroup() *int64 {
+	var defaultGroupID int64 = 1000
+	if nConfig.FSGroup != nil {
+		return nConfig.FSGroup
+	}
+
+	return func(i int64) *int64 { return &i }(defaultGroupID)
+}
+
 //
 func (nConfig *NodeConfig) GetIsNode() bool {
 	if nConfig.IsNode != nil {

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/nifi.orange.com_nificlusters.yaml b/config/crd/bases/nifi.orange.com_nificlusters.yaml
@@ -1415,6 +1415,12 @@ spec:
                 additionalProperties:
                   description: NodeConfig defines the node configuration
                   properties:
+                    FSGroup:
+                      description: FSGroup define the id of the group for each volumes
+                        in Nifi image
+                      format: int64
+                      minimum: 1
+                      type: integer
                     image:
                       description: ' Docker image used by the operator to create the
                         node associated  https://hub.docker.com/r/apache/nifi/'
@@ -1917,6 +1923,12 @@ spec:
                     nodeConfig:
                       description: node configuration
                       properties:
+                        FSGroup:
+                          description: FSGroup define the id of the group for each
+                            volumes in Nifi image
+                          format: int64
+                          minimum: 1
+                          type: integer
                         image:
                           description: ' Docker image used by the operator to create
                             the node associated  https://hub.docker.com/r/apache/nifi/'

diff --git a/pkg/resources/nifi/pod.go b/pkg/resources/nifi/pod.go
@@ -126,7 +126,7 @@ func (r *Reconciler) pod(id int32, nodeConfig *v1alpha1.NodeConfig, pvcs []corev
 			SecurityContext: &corev1.PodSecurityContext{
 				RunAsUser:    nodeConfig.GetRunAsUser(),
 				RunAsNonRoot: func(b bool) *bool { return &b }(true),
-				FSGroup:      func(i int64) *int64 { return &i }(1000),
+				FSGroup:      nodeConfig.GetFSGroup(),
 			},
 			InitContainers: append(initContainers, []corev1.Container{
 				{