feat: support metadataList in runtime (fluid-cloudnative#2777)

* feat: support pvcMetadata in runtime Signed-off-by: weixiao-huang <hwx.simle@gmail.com> * feat: use RuntimeInfoOption for much more elegant Signed-off-by: 黄维啸 <huangweixiao@megvii.com> * fix: code generation Signed-off-by: weixiao-huang <hwx.simle@gmail.com> * feat: use metadataList Signed-off-by: weixiao-huang <hwx.simle@gmail.com> Signed-off-by: 黄维啸 <huangweixiao@megvii.com> --------- Signed-off-by: weixiao-huang <hwx.simle@gmail.com> Signed-off-by: 黄维啸 <huangweixiao@megvii.com>
PlutoEr-001 · Mar 24, 2023 · 9627258 · 9627258
1 parent 8738ac0
commit 9627258
Show file tree

Hide file tree

Showing 25 changed files with 657 additions and 22 deletions.
diff --git a/api/v1alpha1/alluxioruntime_types.go b/api/v1alpha1/alluxioruntime_types.go
@@ -306,6 +306,10 @@ type AlluxioRuntimeSpec struct {
 	// RuntimeManagement defines policies when managing the runtime
 	// +optional
 	RuntimeManagement RuntimeManagement `json:"management,omitempty"`
+
+	// MetadataList defines labels and annotations that will be propagated to resources created by runtime
+	// +optional
+	MetadataList []Metadata `json:"metadataList,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/common.go b/api/v1alpha1/common.go
@@ -99,6 +99,13 @@ type User struct {
 	GroupName string `json:"group"`
 }
 
+// Metadata defines subgroup properties of metav1.ObjectMeta
+type Metadata struct {
+	PodMetadata `json:",inline"`
+
+	Selector metav1.GroupKind `json:"selector,omitempty"`
+}
+
 // PodMetadata defines subgroup properties of metav1.ObjectMeta
 type PodMetadata struct {
 	// Labels are labels of pod specification

diff --git a/api/v1alpha1/eacruntime_types.go b/api/v1alpha1/eacruntime_types.go
@@ -159,6 +159,10 @@ type EACRuntimeSpec struct {
 	// PodMetadata defines labels and annotations that will be propagated to all EAC's pods
 	// +optional
 	PodMetadata PodMetadata `json:"podMetadata,omitempty"`
+
+	// MetadataList defines labels and annotations that will be propagated to resources created by runtime
+	// +optional
+	MetadataList []Metadata `json:"metadataList,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/goosefsruntime_types.go b/api/v1alpha1/goosefsruntime_types.go
@@ -188,6 +188,10 @@ type GooseFSRuntimeSpec struct {
 	// CleanCachePolicy defines cleanCache Policy
 	// +optional
 	CleanCachePolicy CleanCachePolicy `json:"cleanCachePolicy,omitempty"`
+
+	// MetadataList defines labels and annotations that will be propagated to resources created by runtime
+	// +optional
+	MetadataList []Metadata `json:"metadataList,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/jindoruntime_types.go b/api/v1alpha1/jindoruntime_types.go
@@ -202,6 +202,10 @@ type JindoRuntimeSpec struct {
 	// CleanCachePolicy defines cleanCache Policy
 	// +optional
 	CleanCachePolicy CleanCachePolicy `json:"cleanCachePolicy,omitempty"`
+
+	// MetadataList defines labels and annotations that will be propagated to resources created by runtime
+	// +optional
+	MetadataList []Metadata `json:"metadataList,omitempty"`
 }
 
 // +kubebuilder:object:root=true

diff --git a/api/v1alpha1/juicefsruntime_types.go b/api/v1alpha1/juicefsruntime_types.go
@@ -79,6 +79,10 @@ type JuiceFSRuntimeSpec struct {
 	// CleanCachePolicy defines cleanCache Policy
 	// +optional
 	CleanCachePolicy CleanCachePolicy `json:"cleanCachePolicy,omitempty"`
+
+	// MetadataList defines labels and annotations that will be propagated to resources created by runtime
+	// +optional
+	MetadataList []Metadata `json:"metadataList,omitempty"`
 }
 
 // JuiceFSCompTemplateSpec is a description of the JuiceFS components

diff --git a/api/v1alpha1/openapi_generated.go b/api/v1alpha1/openapi_generated.go
diff --git a/api/v1alpha1/thinruntime_types.go b/api/v1alpha1/thinruntime_types.go
@@ -59,6 +59,10 @@ type ThinRuntimeSpec struct {
 	// Volumes is the list of Kubernetes volumes that can be mounted by runtime components and/or fuses.
 	// +optional
 	Volumes []corev1.Volume `json:"volumes,omitempty"`
+
+	// MetadataList defines labels and annotations that will be propagated to resources created by runtime
+	// +optional
+	MetadataList []Metadata `json:"metadataList,omitempty"`
 }
 
 // ThinCompTemplateSpec is a description of the thinRuntime components