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

[BugFix #1551] change mountTime to *v1.Time #1610

Merged
merged 4 commits into from
Apr 7, 2022
Merged

[BugFix #1551] change mountTime to *v1.Time #1610

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea64b6e
fix issue 1551, change mounttime to *v1.Time
Mar 24, 2022
fb07999
Address comments && update crd
Mar 30, 2022
9a010cb
update crd
Mar 30, 2022
67f43c1
Rebuild&generate crd using controller-gen v0.7.0, and add a nil check
Apr 7, 2022
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: 2 additions & 2 deletions api/v1alpha1/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ type RuntimeStatus struct {
APIGatewayStatus *APIGatewayStatus `json:"apiGateway,omitempty"`

// MountTime represents time last mount happened
// if Mounttime is early than master starting time, remount will be required
MountTime metav1.Time `json:"mountTime,omitempty"`
// if Mounttime is earlier than master starting time, remount will be required
MountTime *metav1.Time `json:"mountTime,omitempty"`
Nizifan marked this conversation as resolved.
Show resolved Hide resolved
}

type RuntimePhase string
Expand Down
1,544 changes: 694 additions & 850 deletions charts/fluid/fluid/crds/data.fluid.io_alluxioruntimes.yaml
View file
Open in desktop

Large diffs are not rendered by default.

252 changes: 120 additions & 132 deletions charts/fluid/fluid/crds/data.fluid.io_databackups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@

---
apiVersion: apiextensions.k8s.io/v1
apiVersion: apiextensions.k8s.io/v1beta1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why changing CRD version back from v1 to v1beta1. I think this version CRD is deprecated in K8s 1.22.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is auto generated.

kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.3.0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should build with controller generator with 0.7.0+ .

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I follow the instruction to use 0.3.0 ...
I change it back to 0.7.0 now.

creationTimestamp: null
name: databackups.data.fluid.io
spec:
additionalPrinterColumns:
- JSONPath: .spec.dataset
name: Dataset
type: string
- JSONPath: .status.phase
name: Phase
type: string
- JSONPath: .status.backupLocation.path
name: Path
type: string
- JSONPath: .status.backupLocation.nodeName
name: NodeName
type: string
- JSONPath: .status.duration
name: Duration
type: string
- JSONPath: .metadata.creationTimestamp
name: Age
type: date
group: data.fluid.io
names:
categories:
Expand All @@ -19,144 +38,113 @@ spec:
- backup
singular: databackup
scope: Namespaced
versions:
- additionalPrinterColumns:
- jsonPath: .spec.dataset
name: Dataset
type: string
- jsonPath: .status.phase
name: Phase
type: string
- jsonPath: .status.backupLocation.path
name: Path
type: string
- jsonPath: .status.backupLocation.nodeName
name: NodeName
type: string
- jsonPath: .status.duration
name: Duration
type: string
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v1alpha1
schema:
openAPIV3Schema:
description: DataBackup is the Schema for the backup API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: DataBackupSpec defines the desired state of DataBackup
properties:
backupPath:
description: BackupPath defines the target path to save data of the
DataBackup
type: string
dataset:
description: Dataset defines the target dataset of the DataBackup
type: string
runAs:
description: Manage the user to run Alluxio DataBackup
subresources:
status: {}
validation:
openAPIV3Schema:
description: DataBackup is the Schema for the backup API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
spec:
description: DataBackupSpec defines the desired state of DataBackup
properties:
backupPath:
description: BackupPath defines the target path to save data of the DataBackup
type: string
dataset:
description: Dataset defines the target dataset of the DataBackup
type: string
runAs:
description: Manage the user to run Alluxio DataBackup
properties:
gid:
description: The gid to run the alluxio runtime
format: int64
type: integer
group:
description: The group name to run the alluxio runtime
type: string
uid:
description: The uid to run the alluxio runtime
format: int64
type: integer
user:
description: The user name to run the alluxio runtime
type: string
required:
- gid
- group
- uid
- user
type: object
type: object
status:
description: DataBackupStatus defines the observed state of DataBackup
properties:
backupLocation:
description: BackupLocation tell user the location to save data of the DataBackup
properties:
nodeName:
description: NodeName describes the nodeName of backup if Path is in the form of local://subpath
type: string
path:
description: Path describes the path of backup, in the form of local:///absolutePath or pvc://<pvcName>/subpath
type: string
type: object
conditions:
description: Conditions consists of transition information on DataBackup's Phase
items:
description: Condition explains the transitions on phase
properties:
gid:
description: The gid to run the alluxio runtime
format: int64
type: integer
group:
description: The group name to run the alluxio runtime
lastProbeTime:
description: LastProbeTime describes last time this condition was updated.
format: date-time
type: string
uid:
description: The uid to run the alluxio runtime
format: int64
type: integer
user:
description: The user name to run the alluxio runtime
lastTransitionTime:
description: LastTransitionTime describes last time the condition transitioned from one status to another.
format: date-time
type: string
required:
- gid
- group
- uid
- user
type: object
type: object
status:
description: DataBackupStatus defines the observed state of DataBackup
properties:
backupLocation:
description: BackupLocation tell user the location to save data of
the DataBackup
properties:
nodeName:
description: NodeName describes the nodeName of backup if Path
is in the form of local://subpath
message:
description: Message is a human-readable message indicating details about the transition
type: string
path:
description: Path describes the path of backup, in the form of
local:///absolutePath or pvc://<pvcName>/subpath
reason:
description: Reason for the condition's last transition
type: string
status:
description: Status of the condition, one of `True`, `False` or `Unknown`
type: string
type:
description: Type of condition, either `Complete` or `Failed`
type: string
required:
- status
- type
type: object
conditions:
description: Conditions consists of transition information on DataBackup's
Phase
items:
description: Condition explains the transitions on phase
properties:
lastProbeTime:
description: LastProbeTime describes last time this condition
was updated.
format: date-time
type: string
lastTransitionTime:
description: LastTransitionTime describes last time the condition
transitioned from one status to another.
format: date-time
type: string
message:
description: Message is a human-readable message indicating
details about the transition
type: string
reason:
description: Reason for the condition's last transition
type: string
status:
description: Status of the condition, one of `True`, `False`
or `Unknown`
type: string
type:
description: Type of condition, either `Complete` or `Failed`
type: string
required:
- status
- type
type: object
type: array
duration:
description: Duration tell user how much time was spent to backup
type: string
phase:
description: Phase describes current phase of DataBackup
type: string
required:
- conditions
- duration
- phase
type: object
type: object
type: array
duration:
description: Duration tell user how much time was spent to backup
type: string
phase:
description: Phase describes current phase of DataBackup
type: string
required:
- conditions
- duration
- phase
type: object
type: object
version: v1alpha1
versions:
- name: v1alpha1
served: true
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
Expand Down
Loading