fix: workload missing labels and reopen podoverrides (#48)

zncdatadev · Jul 26, 2024 · ca5a886 · ca5a886
1 parent e79d472
commit ca5a886
Show file tree

Hide file tree

Showing 14 changed files with 28,742 additions and 4,088 deletions.
diff --git a/api/v1alpha1/master_types.go b/api/v1alpha1/master_types.go
@@ -72,6 +72,6 @@ type MasterRoleGroupSpec struct {
 	// +kubebuilder:validation:Optional
 	EnvOverrides map[string]string `json:"envOverrides,omitempty"`
 
-	// // +kubebuilder:validation:Optional
-	// PodOverride *corev1.PodTemplateSpec `json:"podOverride,omitempty"`
+	// +kubebuilder:validation:Optional
+	PodOverrides *corev1.PodTemplateSpec `json:"podOverrides,omitempty"`
 }
diff --git a/api/v1alpha1/regionserver_types.go b/api/v1alpha1/regionserver_types.go
@@ -70,6 +70,6 @@ type RegionServerRoleGroupSpec struct {
 	// +kubebuilder:validation:Optional
 	EnvOverrides map[string]string `json:"envOverrides,omitempty"`
 
-	// // +kubebuilder:validation:Optional
-	// PodOverride *corev1.PodTemplateSpec `json:"podOverride,omitempty"`
+	// +kubebuilder:validation:Optional
+	PodOverrides *corev1.PodTemplateSpec `json:"podOverrides,omitempty"`
 }
diff --git a/api/v1alpha1/restserver_types.go b/api/v1alpha1/restserver_types.go
@@ -72,6 +72,6 @@ type RestServerRoleGroupSpec struct {
 	// +kubebuilder:validation:Optional
 	EnvOverrides map[string]string `json:"envOverrides,omitempty"`
 
-	// // +kubebuilder:validation:Optional
-	// PodOverride *corev1.PodTemplateSpec `json:"podOverride,omitempty"`
+	// +kubebuilder:validation:Optional
+	PodOverrides *corev1.PodTemplateSpec `json:"podOverrides,omitempty"`
 }
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/hbase.zncdata.dev_hbaseclusters.yaml b/config/crd/bases/hbase.zncdata.dev_hbaseclusters.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: quay.io/zncdata/hbase-operator
+  newName: quay.io/zncdatadev/hbase-operator
   newTag: v0.0.1
diff --git a/config/manifests/bases/hbase-operator.clusterserviceversion.yaml b/config/manifests/bases/hbase-operator.clusterserviceversion.yaml
@@ -43,8 +43,8 @@ spec:
   - name: hbase
     url: https://hbase.apache.org/
   maintainers:
-    - email: zncdatadev@googlegroups.com
-      name: ZNCDataDev Team
+  - email: zncdatadev@googlegroups.com
+    name: ZNCDataDev Team
   maturity: stable
   minKubeVersion: 1.26.1
   provider:

diff --git a/internal/controller/common/statefulset.go b/internal/controller/common/statefulset.go
@@ -38,10 +38,9 @@ func NewStatefulSetBuilder(
 	replicas *int32,
 	ports []corev1.ContainerPort,
 	image *util.Image,
+	options *builder.WorkloadOptions,
 ) *StatefulSetBuilder {
 
-	options := &builder.WorkloadOptions{}
-
 	return &StatefulSetBuilder{
 		StatefulSet:   *builder.NewStatefulSetBuilder(client, name, replicas, image, options),
 		Ports:         ports,

diff --git a/internal/controller/master/role.go b/internal/controller/master/role.go
@@ -73,7 +73,7 @@ func (r *Reconciler) RegisterResourceWithRoleGroup(_ context.Context, info recon
 
 	var reconcilers []reconciler.Reconciler
 
-	statefulSetReconciler := NewStatefulSetReconciler(
+	statefulSetReconciler, err := NewStatefulSetReconciler(
 		r.Client,
 		r.ClusterConfig,
 		info,
@@ -82,6 +82,10 @@ func (r *Reconciler) RegisterResourceWithRoleGroup(_ context.Context, info recon
 		roleGroupSpec.(*hbasev1alph1.MasterRoleGroupSpec),
 	)
 
+	if err != nil {
+		return nil, err
+	}
+
 	reconcilers = append(reconcilers, statefulSetReconciler)
 
 	serviceReconciler := common.NewServiceReconciler(

diff --git a/internal/controller/master/statefulset.go b/internal/controller/master/statefulset.go
@@ -1,6 +1,8 @@
 package master
 
 import (
+	"time"
+
 	hbasev1alph1 "github.com/zncdatadev/hbase-operator/api/v1alpha1"
 	"github.com/zncdatadev/hbase-operator/internal/controller/common"
 	"github.com/zncdatadev/operator-go/pkg/builder"
@@ -17,7 +19,33 @@ func NewStatefulSetReconciler(
 	ports []corev1.ContainerPort,
 	image *util.Image,
 	spec *hbasev1alph1.MasterRoleGroupSpec,
-) reconciler.ResourceReconciler[builder.StatefulSetBuilder] {
+) (reconciler.ResourceReconciler[builder.StatefulSetBuilder], error) {
+
+	options := &builder.WorkloadOptions{
+		Labels:           roleGroupInfo.GetLabels(),
+		Annotations:      roleGroupInfo.GetAnnotations(),
+		PodOverrides:     spec.PodOverrides,
+		CommandOverrides: spec.CommandOverrides,
+		EnvOverrides:     spec.EnvOverrides,
+	}
+
+	if spec.Config != nil {
+
+		var gracefulShutdownTimeout time.Duration
+		var err error
+
+		if spec.Config.GracefulShutdownTimeout != nil {
+			gracefulShutdownTimeout, err = time.ParseDuration(*spec.Config.GracefulShutdownTimeout)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		options.TerminationGracePeriod = &gracefulShutdownTimeout
+		options.Resource = spec.Config.Resources
+		options.Affinity = spec.Config.Affinity
+	}
+
 	stsBuilder := common.NewStatefulSetBuilder(
 		client,
 		roleGroupInfo.GetFullName(),
@@ -30,11 +58,12 @@ func NewStatefulSetReconciler(
 		spec.Replicas,
 		ports,
 		image,
+		options,
 	)
 
 	return reconciler.NewStatefulSet(
 		client,
 		roleGroupInfo.GetFullName(),
 		stsBuilder,
-	)
+	), nil
 }
diff --git a/internal/controller/regionserver/role.go b/internal/controller/regionserver/role.go
@@ -40,7 +40,7 @@ func NewReconciler(
 			clusterOperation,
 			spec,
 		),
-		Image: 	   image,
+		Image:         image,
 		ClusterConfig: clusterConfig,
 	}
 }
@@ -72,7 +72,7 @@ func (r *Reconciler) RegisterResourceWithRoleGroup(_ context.Context, info recon
 
 	var reconcilers []reconciler.Reconciler
 
-	statefulSetReconciler := NewStatefulSetReconciler(
+	statefulSetReconciler, err := NewStatefulSetReconciler(
 		r.Client,
 		r.ClusterConfig,
 		info,
@@ -81,6 +81,10 @@ func (r *Reconciler) RegisterResourceWithRoleGroup(_ context.Context, info recon
 		roleGroupSpec.(*hbasev1alph1.RegionServerRoleGroupSpec),
 	)
 
+	if err != nil {
+		return nil, err
+	}
+
 	reconcilers = append(reconcilers, statefulSetReconciler)
 
 	serviceReconciler := common.NewServiceReconciler(

diff --git a/internal/controller/regionserver/statefulset.go b/internal/controller/regionserver/statefulset.go
@@ -1,6 +1,8 @@
 package regionserver
 
 import (
+	"time"
+
 	hbasev1alph1 "github.com/zncdatadev/hbase-operator/api/v1alpha1"
 	"github.com/zncdatadev/hbase-operator/internal/controller/common"
 	"github.com/zncdatadev/operator-go/pkg/builder"
@@ -17,7 +19,32 @@ func NewStatefulSetReconciler(
 	ports []corev1.ContainerPort,
 	image *util.Image,
 	spec *hbasev1alph1.RegionServerRoleGroupSpec,
-) reconciler.ResourceReconciler[builder.StatefulSetBuilder] {
+) (reconciler.ResourceReconciler[builder.StatefulSetBuilder], error) {
+
+	options := &builder.WorkloadOptions{
+		Labels:           roleGroupInfo.GetLabels(),
+		Annotations:      roleGroupInfo.GetAnnotations(),
+		PodOverrides:     spec.PodOverrides,
+		CommandOverrides: spec.CommandOverrides,
+		EnvOverrides:     spec.EnvOverrides,
+	}
+
+	if spec.Config != nil {
+		var gracefulShutdownTimeout time.Duration
+		var err error
+
+		if spec.Config.GracefulShutdownTimeout != nil {
+			gracefulShutdownTimeout, err = time.ParseDuration(*spec.Config.GracefulShutdownTimeout)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		options.TerminationGracePeriod = &gracefulShutdownTimeout
+		options.Resource = spec.Config.Resources
+		options.Affinity = spec.Config.Affinity
+	}
+
 	stsBuilder := common.NewStatefulSetBuilder(
 		client,
 		roleGroupInfo.GetFullName(),
@@ -30,6 +57,7 @@ func NewStatefulSetReconciler(
 		spec.Replicas,
 		ports,
 		image,
+		options,
 	)
 
 	affinityBuilder := stsBuilder.GetDefaultAffinityBuilder()
@@ -50,5 +78,5 @@ func NewStatefulSetReconciler(
 		client,
 		roleGroupInfo.GetFullName(),
 		stsBuilder,
-	)
+	), nil
 }
diff --git a/internal/controller/restserver/role.go b/internal/controller/restserver/role.go
@@ -40,7 +40,7 @@ func NewReconciler(
 			clusterOperation,
 			spec,
 		),
-		Image: 	   image,
+		Image:         image,
 		ClusterConfig: clusterConfig,
 	}
 }
@@ -72,7 +72,7 @@ func (r *Reconciler) RegisterResourceWithRoleGroup(_ context.Context, info recon
 
 	var reconcilers []reconciler.Reconciler
 
-	statefulSetReconciler := NewStatefulSetReconciler(
+	statefulSetReconciler, err := NewStatefulSetReconciler(
 		r.Client,
 		r.ClusterConfig,
 		info,
@@ -81,6 +81,10 @@ func (r *Reconciler) RegisterResourceWithRoleGroup(_ context.Context, info recon
 		roleGroupSpec.(*hbasev1alph1.RestServerRoleGroupSpec),
 	)
 
+	if err != nil {
+		return nil, err
+	}
+
 	reconcilers = append(reconcilers, statefulSetReconciler)
 
 	serviceReconciler := common.NewServiceReconciler(

diff --git a/internal/controller/restserver/statefulset.go b/internal/controller/restserver/statefulset.go
@@ -1,6 +1,8 @@
 package restserver
 
 import (
+	"time"
+
 	hbasev1alph1 "github.com/zncdatadev/hbase-operator/api/v1alpha1"
 	"github.com/zncdatadev/hbase-operator/internal/controller/common"
 	"github.com/zncdatadev/operator-go/pkg/builder"
@@ -17,7 +19,32 @@ func NewStatefulSetReconciler(
 	ports []corev1.ContainerPort,
 	image *util.Image,
 	spec *hbasev1alph1.RestServerRoleGroupSpec,
-) reconciler.ResourceReconciler[builder.StatefulSetBuilder] {
+) (reconciler.ResourceReconciler[builder.StatefulSetBuilder], error) {
+
+	options := &builder.WorkloadOptions{
+		Labels:           roleGroupInfo.GetLabels(),
+		Annotations:      roleGroupInfo.GetAnnotations(),
+		PodOverrides:     spec.PodOverrides,
+		CommandOverrides: spec.CommandOverrides,
+		EnvOverrides:     spec.EnvOverrides,
+	}
+
+	if spec.Config != nil {
+		var gracefulShutdownTimeout time.Duration
+		var err error
+
+		if spec.Config.GracefulShutdownTimeout != nil {
+			gracefulShutdownTimeout, err = time.ParseDuration(*spec.Config.GracefulShutdownTimeout)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		options.TerminationGracePeriod = &gracefulShutdownTimeout
+		options.Resource = spec.Config.Resources
+		options.Affinity = spec.Config.Affinity
+	}
+
 	stsBuilder := common.NewStatefulSetBuilder(
 		client,
 		roleGroupInfo.GetFullName(),
@@ -30,11 +57,12 @@ func NewStatefulSetReconciler(
 		spec.Replicas,
 		ports,
 		image,
+		options,
 	)
 
 	return reconciler.NewStatefulSet(
 		client,
 		roleGroupInfo.GetFullName(),
 		stsBuilder,
-	)
+	), nil
 }