Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api): Extraction of public structures #12

Closed
wants to merge 2 commits into from
Closed

feat(api): Extraction of public structures #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
765901b
feat(api): Extraction of public structures
wastill Dec 22, 2023
29f9b03
feat(api): Extraction of public structures
wastill Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 14 additions & 114 deletions api/v1alpha1/sparkhistoryserver_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ limitations under the License.
package v1alpha1

import (
"github.com/zncdata-labs/operator-go/pkg/image"
"github.com/zncdata-labs/operator-go/pkg/ingress"
"github.com/zncdata-labs/operator-go/pkg/persistence"
"github.com/zncdata-labs/operator-go/pkg/service"
"github.com/zncdata-labs/operator-go/pkg/status"
corev1 "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1"
apimeta "k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand All @@ -29,7 +32,7 @@ import (
// SparkHistoryServerSpec defines the desired state of SparkHistoryServer
type SparkHistoryServerSpec struct {
// +kubebuilder:validation:Required
Image *ImageSpec `json:"image"`
Image *image.ImageSpec `json:"image"`

// +kubebuilder:validation:Optional
// +kubebuilder:validation:Minimum=1
Expand All @@ -44,13 +47,13 @@ type SparkHistoryServerSpec struct {
SecurityContext *corev1.PodSecurityContext `json:"securityContext"`

// +kubebuilder:validation:Required
Persistence *PersistenceSpec `json:"persistence"`
Persistence *persistence.PersistenceSpec `json:"persistence"`

// +kubebuilder:validation:Required
Ingress *IngressSpec `json:"ingress"`
Ingress *ingress.IngressSpec `json:"ingress"`

// +kubebuilder:validation:Required
Service *ServiceSpec `json:"service"`
Service *service.ServiceSpec `json:"service"`

// +kubebuilder:validation:Optional
Labels map[string]string `json:"labels"`
Expand All @@ -69,47 +72,9 @@ type SparkHistoryServerSpec struct {
}

func (sparkHistory *SparkHistoryServer) GetNameWithSuffix(suffix string) string {
// return sparkHistory.GetName() + rand.String(5) + suffix
return sparkHistory.GetName() + suffix
}

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
PullPolicy corev1.PullPolicy `json:"pullPolicy,omitempty"`
}

type PersistenceSpec struct {
// +kubebuilder:validation:Optional
// +kubebuilder:default:=true
Enable bool `json:"enable,omitempty"`
// +kubebuilder:validation:Optional
ExistingClaim *string `json:"existingClaim,omitempty"`
// +kubebuilder:validation:Optional
Annotations map[string]string `json:"annotations,omitempty"`
// +kubebuilder:validation:Optional
// +kubebuilder:default:="10Gi"
StorageSize string `json:"storageSize,omitempty"`
// +kubebuilder:validation:Optional
// +kubebuilder:default:="ReadWriteOnce"
AccessMode string `json:"accessMode,omitempty"`
// +kubebuilder:validation:Optional
StorageClassName *string `json:"storageClassName,omitempty"`
// +kubebuilder:validation:Optional
// +kubebuilder:default=Filesystem
VolumeMode *corev1.PersistentVolumeMode `json:"volumeMode,omitempty"`
}

func (p *PersistenceSpec) Existing() bool {
return p.ExistingClaim != nil
}

func (sparkHistory *SparkHistoryServer) GetPvcName() string {
if sparkHistory.Spec.Persistence != nil && sparkHistory.Spec.Persistence.Existing() {
return *sparkHistory.Spec.Persistence.ExistingClaim
Expand All @@ -118,82 +83,17 @@ func (sparkHistory *SparkHistoryServer) GetPvcName() string {
return sparkHistory.GetNameWithSuffix("-pvc")
}

type IngressSpec struct {
// +kubebuilder:validation:Optional
// +kubebuilder:default:=true
Enabled bool `json:"enabled,omitempty"`
// +kubebuilder:validation:Optional
TLS *networkingv1.IngressTLS `json:"tls,omitempty"`
// +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"`
}

type ServiceSpec struct {
// +kubebuilder:validation:Optional
Annotations map[string]string `json:"annotations,omitempty"`
// +kubebuilder:validation:enum=ClusterIP;NodePort;LoadBalancer;ExternalName
// +kubebuilder:default=ClusterIP
Type corev1.ServiceType `json:"type,omitempty"`
// +kubebuilder:validation:Minimum=1
// +kubebuilder:validation:Maximum=65535
// +kubebuilder:default=18080
Port int32 `json:"port"`
}

// SetStatusCondition updates the status condition using the provided arguments.
// If the condition already exists, it updates the condition; otherwise, it appends the condition.
// If the condition status has changed, it updates the condition's LastTransitionTime.
func (sparkHistory *SparkHistoryServer) SetStatusCondition(condition metav1.Condition) {
// if the condition already exists, update it
existingCondition := apimeta.FindStatusCondition(sparkHistory.Status.Conditions, condition.Type)
if existingCondition == nil {
condition.ObservedGeneration = sparkHistory.GetGeneration()
condition.LastTransitionTime = metav1.Now()
sparkHistory.Status.Conditions = append(sparkHistory.Status.Conditions, condition)
} else if existingCondition.Status != condition.Status || existingCondition.Reason != condition.Reason || existingCondition.Message != condition.Message {
existingCondition.Status = condition.Status
existingCondition.Reason = condition.Reason
existingCondition.Message = condition.Message
existingCondition.ObservedGeneration = sparkHistory.GetGeneration()
existingCondition.LastTransitionTime = metav1.Now()
}
sparkHistory.Status.SetStatusCondition(condition)
}

// InitStatusConditions initializes the status conditions to the provided conditions.
func (sparkHistory *SparkHistoryServer) InitStatusConditions() {
sparkHistory.Status.Conditions = []metav1.Condition{}
sparkHistory.SetStatusCondition(metav1.Condition{
Type: ConditionTypeProgressing,
Status: metav1.ConditionTrue,
Reason: ConditionReasonPreparing,
Message: "SparkHistoryServer is preparing",
ObservedGeneration: sparkHistory.GetGeneration(),
LastTransitionTime: metav1.Now(),
})
sparkHistory.SetStatusCondition(metav1.Condition{
Type: ConditionTypeAvailable,
Status: metav1.ConditionFalse,
Reason: ConditionReasonPreparing,
Message: "SparkHistoryServer is preparing",
ObservedGeneration: sparkHistory.GetGeneration(),
LastTransitionTime: metav1.Now(),
})
}

// SparkHistoryServerStatus defines the observed state of SparkHistoryServer
type SparkHistoryServerStatus struct {
// +kubebuilder:validation:Optional
Conditions []metav1.Condition `json:"condition,omitempty"`
// +kubebuilder:validation:Optional
URLs []StatusURL `json:"urls,omitempty"`
}

type StatusURL struct {
Name string `json:"name"`
URL string `json:"url"`
sparkHistory.Status.InitStatus(sparkHistory)
sparkHistory.Status.InitStatusConditions()
}

//+kubebuilder:object:root=true
Expand All @@ -204,8 +104,8 @@ type SparkHistoryServer struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec SparkHistoryServerSpec `json:"spec,omitempty"`
Status SparkHistoryServerStatus `json:"status,omitempty"`
Spec SparkHistoryServerSpec `json:"spec,omitempty"`
Status status.ZncdataStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true
Expand Down
157 changes: 4 additions & 153 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading