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

Jump to bottom

feat: move metadata list to annotation #3146

Merged
merged 6 commits into from
May 5, 2023
Merged

feat: move metadata list to annotation #3146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e07a5ec
feat(runtime): move metadataList to annotations
weixiao-huang Apr 22, 2023
56146c3
feat(runtime): move metadataList to annotations
weixiao-huang Apr 22, 2023
0d3e3b9
feat: update-crd
weixiao-huang Apr 23, 2023
60fc429
feat: improve json unmarshal and improve BuildRuntimeInfo for other p…
weixiao-huang May 3, 2023
e1b92ed
fix: lint error
weixiao-huang May 3, 2023
1af1a37
feat: add error log
weixiao-huang May 3, 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
4 changes: 0 additions & 4 deletions api/v1alpha1/alluxioruntime_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,6 @@ 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
Expand Down
4 changes: 0 additions & 4 deletions api/v1alpha1/efcruntime_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,6 @@ type EFCRuntimeSpec struct {
// PodMetadata defines labels and annotations that will be propagated to all EFC'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
Expand Down
4 changes: 0 additions & 4 deletions api/v1alpha1/goosefsruntime_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,6 @@ 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
Expand Down
4 changes: 0 additions & 4 deletions api/v1alpha1/jindoruntime_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,6 @@ 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
Expand Down
4 changes: 0 additions & 4 deletions api/v1alpha1/juicefsruntime_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ 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
Expand Down
96 changes: 6 additions & 90 deletions api/v1alpha1/openapi_generated.go
View file
Open in desktop

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

4 changes: 0 additions & 4 deletions api/v1alpha1/thinruntime_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ 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
Expand Down
42 changes: 0 additions & 42 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.

31 changes: 0 additions & 31 deletions charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,37 +910,6 @@ spec:
type: object
type: array
type: object
metadataList:
description: MetadataList defines labels and annotations that will
be propagated to resources created by runtime
items:
description: Metadata defines subgroup properties of metav1.ObjectMeta
properties:
annotations:
additionalProperties:
type: string
description: Annotations are annotations of pod specification
type: object
labels:
additionalProperties:
type: string
description: Labels are labels of pod specification
type: object
selector:
description: GroupKind specifies a Group and a Kind, but does
not force a version. This is useful for identifying concepts
during lookup stages without having partially valid types
properties:
group:
type: string
kind:
type: string
required:
- group
- kind
type: object
type: object
type: array
podMetadata:
description: PodMetadata defines labels and annotations that will
be propagated to Alluxio's pods
Expand Down
31 changes: 0 additions & 31 deletions charts/fluid/fluid/crds/data.fluid.io_efcruntimes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,37 +306,6 @@ spec:
type: string
type: object
type: object
metadataList:
description: MetadataList defines labels and annotations that will
be propagated to resources created by runtime
items:
description: Metadata defines subgroup properties of metav1.ObjectMeta
properties:
annotations:
additionalProperties:
type: string
description: Annotations are annotations of pod specification
type: object
labels:
additionalProperties:
type: string
description: Labels are labels of pod specification
type: object
selector:
description: GroupKind specifies a Group and a Kind, but does
not force a version. This is useful for identifying concepts
during lookup stages without having partially valid types
properties:
group:
type: string
kind:
type: string
required:
- group
- kind
type: object
type: object
type: array
osAdvise:
description: Operating system optimization for EFC
properties:
Expand Down
Loading