fix: complete s3connection

1. complete s3connection, add field
zncdatadev · Jan 3, 2024 · d780769 · d780769
1 parent b10e471
commit d780769
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 35 deletions.
diff --git a/pkg/image/image_spec.go b/pkg/image/image_spec.go
@@ -4,10 +4,8 @@ import corev1 "k8s.io/api/core/v1"
 
 type ImageSpec struct {
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:="bitnami/spark"
 	Repository string `json:"repository,omitempty"`
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:="3.4.1"
 	Tag string `json:"tag,omitempty"`
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default:=IfNotPresent

diff --git a/pkg/ingress/ingress_spec.go b/pkg/ingress/ingress_spec.go
@@ -13,7 +13,6 @@ type IngressSpec struct {
 	// +kubebuilder:validation:Optional
 	Annotations map[string]string `json:"annotations,omitempty"`
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:="spark-history-server.example.com"
 	Host string `json:"host,omitempty"`
 }
 

diff --git a/pkg/operators/v1alphav1/database.go → pkg/operators/v1alpha1/database.go b/pkg/operators/v1alphav1/database.go → pkg/operators/v1alpha1/database.go
@@ -1,4 +1,4 @@
-package v1alphav1 //nolint:typecheck
+package v1alpha1 //nolint:typecheck
 import (
 	"github.com/zncdata-labs/operator-go/pkg/status"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -29,8 +29,8 @@ type Database struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   DatabaseSpec         `json:"spec,omitempty"`
-	Status status.ZncdataStatus `json:"status,omitempty"`
+	Spec   DatabaseSpec  `json:"spec,omitempty"`
+	Status status.Status `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/...operators/v1alphav1/databaseconnection.go → pkg/operators/v1alpha1/databaseconnection.go b/...operators/v1alphav1/databaseconnection.go → pkg/operators/v1alpha1/databaseconnection.go
@@ -1,4 +1,4 @@
-package v1alphav1
+package v1alpha1
 
 import (
 	"github.com/zncdata-labs/operator-go/pkg/status"
@@ -26,7 +26,7 @@ type DatabaseConnection struct {
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	Spec   DatabaseConnectionSpec `json:"spec,omitempty"`
-	Status status.ZncdataStatus   `json:"status,omitempty"`
+	Status status.Status          `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/pkg/operators/v1alphav1/provider.go → pkg/operators/v1alpha1/provider.go b/pkg/operators/v1alphav1/provider.go → pkg/operators/v1alpha1/provider.go
@@ -1,4 +1,4 @@
-package v1alphav1
+package v1alpha1
 
 // DatabaseProvider defines all types database provider of DatabaseConnection
 type DatabaseProvider struct {

diff --git a/pkg/operators/v1alphav1/s3bucket.go → pkg/operators/v1alpha1/s3bucket.go b/pkg/operators/v1alphav1/s3bucket.go → pkg/operators/v1alpha1/s3bucket.go
@@ -1,4 +1,4 @@
-package v1alphav1
+package v1alpha1
 
 import (
 	"github.com/zncdata-labs/operator-go/pkg/status"
@@ -37,8 +37,8 @@ type S3Bucket struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   S3BucketSpec         `json:"spec,omitempty"`
-	Status status.ZncdataStatus `json:"status,omitempty"`
+	Spec   S3BucketSpec  `json:"spec,omitempty"`
+	Status status.Status `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/pkg/operators/v1alphav1/s3connection.go → pkg/operators/v1alpha1/s3connection.go b/pkg/operators/v1alphav1/s3connection.go → pkg/operators/v1alpha1/s3connection.go
@@ -1,4 +1,4 @@
-package v1alphav1
+package v1alpha1
 
 import (
 	"github.com/zncdata-labs/operator-go/pkg/status"
@@ -35,8 +35,8 @@ type S3Connection struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   S3ConnectionSpec     `json:"spec,omitempty"`
-	Status status.ZncdataStatus `json:"status,omitempty"`
+	Spec   S3ConnectionSpec `json:"spec,omitempty"`
+	Status status.Status    `json:"status,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/...rators/v1alphav1/zz_generated.deepcopy.go → ...erators/v1alpha1/zz_generated.deepcopy.go b/...rators/v1alphav1/zz_generated.deepcopy.go → ...erators/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/status/zncdata_status.go → pkg/status/status.go b/pkg/status/zncdata_status.go → pkg/status/status.go
@@ -7,8 +7,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// ZncdataStatus defines the common state of Zncdata
-type ZncdataStatus struct {
+// Status defines the common state of Zncdata
+type Status struct {
 	// +kubebuilder:validation:Optional
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 	// +kubebuilder:validation:Optional
@@ -19,12 +19,12 @@ type ZncdataStatus struct {
 }
 
 // IsAvailable returns true if the status is available.
-func (status *ZncdataStatus) IsAvailable() bool {
+func (status *Status) IsAvailable() bool {
 	return apimeta.IsStatusConditionTrue(status.Conditions, ConditionTypeAvailable)
 }
 
 // SetStatusCondition sets the status condition.
-func (status *ZncdataStatus) SetStatusCondition(condition metav1.Condition) (updated bool) {
+func (status *Status) SetStatusCondition(condition metav1.Condition) (updated bool) {
 	// if the condition already exists, update it
 	existingCondition := apimeta.FindStatusCondition(status.Conditions, condition.Type)
 	if existingCondition == nil {
@@ -45,7 +45,7 @@ func (status *ZncdataStatus) SetStatusCondition(condition metav1.Condition) (upd
 }
 
 // InitStatusConditions initializes the status conditions to the provided conditions.
-func (status *ZncdataStatus) InitStatusConditions() {
+func (status *Status) InitStatusConditions() {
 	status.Conditions = []metav1.Condition{}
 	status.SetStatusCondition(metav1.Condition{
 		Type:               ConditionTypeProgressing,
@@ -66,7 +66,7 @@ func (status *ZncdataStatus) InitStatusConditions() {
 }
 
 // InitStatus initializes the status.
-func (status *ZncdataStatus) InitStatus(object client.Object) {
+func (status *Status) InitStatus(object client.Object) {
 	generation := object.GetGeneration()
 	name := object.GetName()
 	kind := object.GetObjectKind().GroupVersionKind().Kind
@@ -76,7 +76,7 @@ func (status *ZncdataStatus) InitStatus(object client.Object) {
 }
 
 // GetGeneration returns the status's generation.
-func (status *ZncdataStatus) GetGeneration() int64 {
+func (status *Status) GetGeneration() int64 {
 	return status.Generation
 }
 
@@ -87,28 +87,28 @@ type URL struct {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ZncdataStatus) DeepCopyInto(out *ZncdataStatus) {
-	*out = *in
-	if in.Conditions != nil {
-		in, out := &in.Conditions, &out.Conditions
+func (status *Status) DeepCopyInto(out *Status) {
+	*out = *status
+	if status.Conditions != nil {
+		in, out := &status.Conditions, &out.Conditions
 		*out = make([]metav1.Condition, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.URLs != nil {
-		in, out := &in.URLs, &out.URLs
+	if status.URLs != nil {
+		in, out := &status.URLs, &out.URLs
 		*out = make([]URL, len(*in))
 		copy(*out, *in)
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ZncdataStatus.
-func (in *ZncdataStatus) DeepCopy() *ZncdataStatus {
-	if in == nil {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Status.
+func (status *Status) DeepCopy() *Status {
+	if status == nil {
 		return nil
 	}
-	out := new(ZncdataStatus)
-	in.DeepCopyInto(out)
+	out := new(Status)
+	status.DeepCopyInto(out)
 	return out
 }
diff --git a/pkg/utils/reconcilier_util.go b/pkg/utils/reconcilier_util.go
@@ -90,7 +90,7 @@ func CreateOrUpdate(ctx context.Context, c client.Client, obj client.Object) err
 	return err
 }
 
-// UpdateStatus updates the status of the SparkHistoryServer resource
+// UpdateStatus updates the status of the Server resource
 // https://stackoverflow.com/questions/76388004/k8s-controller-update-status-and-condition
 func UpdateStatus(ctx context.Context, reconcilier client.Client, instance client.Object) error {
 	retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {