expose podManagementPolicy

com6056 · com6056 · commit 23e23e6267ed · 2024-05-17T14:10:57.000-07:00
Signed-off-by: Jordan Rodgers &lt;jrodgers@mux.com&gt;
diff --git a/api/common_types.go b/api/common_types.go
@@ -14,6 +14,7 @@ type KubernetesConfig struct {
 	ExistingPasswordSecret *ExistingPasswordSecret          `json:"redisSecret,omitempty"`
 	ImagePullSecrets       *[]corev1.LocalObjectReference   `json:"imagePullSecrets,omitempty"`
 	UpdateStrategy         appsv1.StatefulSetUpdateStrategy `json:"updateStrategy,omitempty"`
+	PodManagementPolicy    appsv1.PodManagementPolicyType   `json:"podManagementPolicy,omitempty"`
 	Service                *ServiceConfig                   `json:"service,omitempty"`
 	IgnoreAnnotations      []string                         `json:"ignoreAnnotations,omitempty"`
 }
diff --git a/config/crd/bases/redis.redis.opstreelabs.in_redis.yaml b/config/crd/bases/redis.redis.opstreelabs.in_redis.yaml
@@ -1107,6 +1107,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
@@ -5795,6 +5799,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
diff --git a/config/crd/bases/redis.redis.opstreelabs.in_redisclusters.yaml b/config/crd/bases/redis.redis.opstreelabs.in_redisclusters.yaml
@@ -159,6 +159,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
@@ -6411,6 +6415,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
diff --git a/config/crd/bases/redis.redis.opstreelabs.in_redisreplications.yaml b/config/crd/bases/redis.redis.opstreelabs.in_redisreplications.yaml
@@ -1109,6 +1109,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
@@ -5803,6 +5807,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
diff --git a/config/crd/bases/redis.redis.opstreelabs.in_redissentinels.yaml b/config/crd/bases/redis.redis.opstreelabs.in_redissentinels.yaml
@@ -1110,6 +1110,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
@@ -3426,6 +3430,10 @@ spec:
                           type: string
                       type: object
                     type: array
+                  podManagementPolicy:
+                    description: PodManagementPolicyType defines the policy for creating
+                      pods under a stateful set.
+                    type: string
                   redisSecret:
                     description: ExistingPasswordSecret is the struct to access the
                       existing secret
diff --git a/docs/content/en/docs/CRD Reference/Redis API/_index.md b/docs/content/en/docs/CRD Reference/Redis API/_index.md
@@ -56,6 +56,7 @@ _Appears in:_
 | `redisSecret` _[ExistingPasswordSecret](#existingpasswordsecret)_ |  |
 | `imagePullSecrets` _[LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#localobjectreference-v1-core)_ |  |
 | `updateStrategy` _[StatefulSetUpdateStrategy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#statefulsetupdatestrategy-v1-apps)_ |  |
+| `podManagementPolicy` _[PodManagementPolicy](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies)_ |  |
 
 #### Redis
 
diff --git a/k8sutils/redis-cluster.go b/k8sutils/redis-cluster.go
@@ -45,6 +45,7 @@ func generateRedisClusterParams(cr *redisv1beta2.RedisCluster, replicas int32, e
 		Tolerations:                   params.Tolerations,
 		ServiceAccountName:            cr.Spec.ServiceAccountName,
 		UpdateStrategy:                cr.Spec.KubernetesConfig.UpdateStrategy,
+		PodManagementPolicy:           cr.Spec.KubernetesConfig.PodManagementPolicy,
 		IgnoreAnnotations:             cr.Spec.KubernetesConfig.IgnoreAnnotations,
 		HostNetwork:                   cr.Spec.HostNetwork,
 	}
diff --git a/k8sutils/redis-replication.go b/k8sutils/redis-replication.go
@@ -92,6 +92,7 @@ func generateRedisReplicationParams(cr *redisv1beta2.RedisReplication) statefulS
 		Tolerations:                   cr.Spec.Tolerations,
 		TerminationGracePeriodSeconds: cr.Spec.TerminationGracePeriodSeconds,
 		UpdateStrategy:                cr.Spec.KubernetesConfig.UpdateStrategy,
+		PodManagementPolicy:           cr.Spec.KubernetesConfig.PodManagementPolicy,
 		IgnoreAnnotations:             cr.Spec.KubernetesConfig.IgnoreAnnotations,
 	}
 	if cr.Spec.KubernetesConfig.ImagePullSecrets != nil {
diff --git a/k8sutils/redis-sentinel.go b/k8sutils/redis-sentinel.go
@@ -98,6 +98,7 @@ func generateRedisSentinelParams(cr *redisv1beta2.RedisSentinel, replicas int32,
 		Tolerations:                   cr.Spec.Tolerations,
 		ServiceAccountName:            cr.Spec.ServiceAccountName,
 		UpdateStrategy:                cr.Spec.KubernetesConfig.UpdateStrategy,
+		PodManagementPolicy:           cr.Spec.KubernetesConfig.PodManagementPolicy,
 		IgnoreAnnotations:             cr.Spec.KubernetesConfig.IgnoreAnnotations,
 	}
 
diff --git a/k8sutils/redis-standalone.go b/k8sutils/redis-standalone.go
@@ -88,6 +88,7 @@ func generateRedisStandaloneParams(cr *redisv1beta2.Redis) statefulSetParameters
 		TerminationGracePeriodSeconds: cr.Spec.TerminationGracePeriodSeconds,
 		Tolerations:                   cr.Spec.Tolerations,
 		UpdateStrategy:                cr.Spec.KubernetesConfig.UpdateStrategy,
+		PodManagementPolicy:           cr.Spec.KubernetesConfig.PodManagementPolicy,
 		IgnoreAnnotations:             cr.Spec.KubernetesConfig.IgnoreAnnotations,
 	}
 	if cr.Spec.KubernetesConfig.ImagePullSecrets != nil {
diff --git a/k8sutils/statefulset.go b/k8sutils/statefulset.go
@@ -46,6 +46,7 @@ type statefulSetParameters struct {
 	ExternalConfig                *string
 	ServiceAccountName            *string
 	UpdateStrategy                appsv1.StatefulSetUpdateStrategy
+	PodManagementPolicy           appsv1.PodManagementPolicyType
 	RecreateStatefulSet           bool
 	TerminationGracePeriodSeconds *int64
 	IgnoreAnnotations             []string
@@ -220,10 +221,11 @@ func generateStatefulSetsDef(stsMeta metav1.ObjectMeta, params statefulSetParame
 		TypeMeta:   generateMetaInformation("StatefulSet", "apps/v1"),
 		ObjectMeta: stsMeta,
 		Spec: appsv1.StatefulSetSpec{
-			Selector:       LabelSelectors(stsMeta.GetLabels()),
-			ServiceName:    fmt.Sprintf("%s-headless", stsMeta.Name),
-			Replicas:       params.Replicas,
-			UpdateStrategy: params.UpdateStrategy,
+			Selector:            LabelSelectors(stsMeta.GetLabels()),
+			ServiceName:         fmt.Sprintf("%s-headless", stsMeta.Name),
+			Replicas:            params.Replicas,
+			UpdateStrategy:      params.UpdateStrategy,
+			PodManagementPolicy: appsv1.ParallelPodManagement,
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels:      stsMeta.GetLabels(),

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ type KubernetesConfig struct {`
`14`	`14`	ExistingPasswordSecret *ExistingPasswordSecret `json:"redisSecret,omitempty"`
`15`	`15`	ImagePullSecrets *[]corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
`16`	`16`	UpdateStrategy appsv1.StatefulSetUpdateStrategy `json:"updateStrategy,omitempty"`
	`17`	+ PodManagementPolicy appsv1.PodManagementPolicyType `json:"podManagementPolicy,omitempty"`
`17`	`18`	Service *ServiceConfig `json:"service,omitempty"`
`18`	`19`	IgnoreAnnotations []string `json:"ignoreAnnotations,omitempty"`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func generateRedisClusterParams(cr *redisv1beta2.RedisCluster, replicas int32, e`
`45`	`45`	`Tolerations: params.Tolerations,`
`46`	`46`	`ServiceAccountName: cr.Spec.ServiceAccountName,`
`47`	`47`	`UpdateStrategy: cr.Spec.KubernetesConfig.UpdateStrategy,`
	`48`	`+ PodManagementPolicy: cr.Spec.KubernetesConfig.PodManagementPolicy,`
`48`	`49`	`IgnoreAnnotations: cr.Spec.KubernetesConfig.IgnoreAnnotations,`
`49`	`50`	`HostNetwork: cr.Spec.HostNetwork,`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ func generateRedisReplicationParams(cr *redisv1beta2.RedisReplication) statefulS`
`92`	`92`	`Tolerations: cr.Spec.Tolerations,`
`93`	`93`	`TerminationGracePeriodSeconds: cr.Spec.TerminationGracePeriodSeconds,`
`94`	`94`	`UpdateStrategy: cr.Spec.KubernetesConfig.UpdateStrategy,`
	`95`	`+ PodManagementPolicy: cr.Spec.KubernetesConfig.PodManagementPolicy,`
`95`	`96`	`IgnoreAnnotations: cr.Spec.KubernetesConfig.IgnoreAnnotations,`
`96`	`97`	`}`
`97`	`98`	`if cr.Spec.KubernetesConfig.ImagePullSecrets != nil {`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ func generateRedisSentinelParams(cr *redisv1beta2.RedisSentinel, replicas int32,`
`98`	`98`	`Tolerations: cr.Spec.Tolerations,`
`99`	`99`	`ServiceAccountName: cr.Spec.ServiceAccountName,`
`100`	`100`	`UpdateStrategy: cr.Spec.KubernetesConfig.UpdateStrategy,`
	`101`	`+ PodManagementPolicy: cr.Spec.KubernetesConfig.PodManagementPolicy,`
`101`	`102`	`IgnoreAnnotations: cr.Spec.KubernetesConfig.IgnoreAnnotations,`
`102`	`103`	`}`
`103`	`104`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ func generateRedisStandaloneParams(cr *redisv1beta2.Redis) statefulSetParameters`
`88`	`88`	`TerminationGracePeriodSeconds: cr.Spec.TerminationGracePeriodSeconds,`
`89`	`89`	`Tolerations: cr.Spec.Tolerations,`
`90`	`90`	`UpdateStrategy: cr.Spec.KubernetesConfig.UpdateStrategy,`
	`91`	`+ PodManagementPolicy: cr.Spec.KubernetesConfig.PodManagementPolicy,`
`91`	`92`	`IgnoreAnnotations: cr.Spec.KubernetesConfig.IgnoreAnnotations,`
`92`	`93`	`}`
`93`	`94`	`if cr.Spec.KubernetesConfig.ImagePullSecrets != nil {`