Skip to content

Commit

Permalink
add new version beta4
Browse files Browse the repository at this point in the history
  • Loading branch information
sinhaashish authored and wlan0 committed Apr 20, 2022
1 parent 9ddbca2 commit d4d31a3
Show file tree
Hide file tree
Showing 94 changed files with 4,138 additions and 187 deletions.
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/drives.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package main

import (
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/utils"
"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/drives_accesstier_set.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"strings"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/utils"

"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/drives_accesstier_unset.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"strings"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/utils"

"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/drives_format.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"context"
"fmt"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/utils"

"github.com/spf13/cobra"
Expand Down
4 changes: 2 additions & 2 deletions cmd/kubectl-directpv/drives_format_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/minio/directpv/pkg/client"
"github.com/minio/directpv/pkg/utils"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
clientsetfake "github.com/minio/directpv/pkg/clientset/fake"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -97,7 +97,7 @@ func TestFormatDrivesByAttributes(t1 *testing.T) {
ctx, cancelFunc := context.WithCancel(context.Background())
defer cancelFunc()
testClientSet := clientsetfake.NewSimpleClientset(testDriveObjects...)
driveInterface := testClientSet.DirectV1beta3().DirectCSIDrives()
driveInterface := testClientSet.DirectV1beta4().DirectCSIDrives()
client.SetLatestDirectCSIDriveInterface(driveInterface)

resetDrives := func() error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/drives_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"sort"
"strings"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/utils"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/drives_release.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"strings"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/sys"
"github.com/minio/directpv/pkg/utils"

Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/client"
"github.com/minio/directpv/pkg/utils"

Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/dustin/go-humanize"
"github.com/fatih/color"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"

"github.com/minio/directpv/pkg/client"
"github.com/minio/directpv/pkg/ellipsis"
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"reflect"
"testing"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/utils"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-directpv/volumes_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"os"
"strings"

directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta3"
directcsi "github.com/minio/directpv/pkg/apis/direct.csi.min.io/v1beta4"
"github.com/minio/directpv/pkg/sys"
"github.com/minio/directpv/pkg/utils"

Expand Down
233 changes: 233 additions & 0 deletions config/crd/direct.csi.min.io_directcsidrives.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,239 @@ spec:
- spec
type: object
served: true
storage: false
- name: v1beta4
schema:
openAPIV3Schema:
description: DirectCSIDrive denotes drive CRD object.
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: DirectCSIDriveSpec denotes drive specification.
properties:
directCSIOwned:
description: required
type: boolean
driveTaint:
additionalProperties:
type: string
type: object
requestedFormat:
description: RequestedFormat denotes drive format request information.
properties:
filesystem:
type: string
force:
type: boolean
mountOptions:
items:
type: string
type: array
x-kubernetes-list-type: atomic
mountpoint:
type: string
purge:
type: boolean
type: object
required:
- directCSIOwned
type: object
status:
description: DirectCSIDriveStatus denotes drive information.
properties:
accessTier:
description: AccessTier denotes access tier.
type: string
allocatedCapacity:
format: int64
type: integer
conditions:
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are:
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
\n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
type: string
status:
description: status of the condition, one of True, False, Unknown.
enum:
- "True"
- "False"
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
required:
- lastTransitionTime
- message
- reason
- status
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
dmName:
type: string
dmUUID:
type: string
driveStatus:
description: DriveStatus denotes drive status.
type: string
filesystem:
type: string
filesystemUUID:
type: string
freeCapacity:
format: int64
type: integer
logicalBlockSize:
format: int64
type: integer
majorNumber:
format: int32
type: integer
master:
type: string
mdUUID:
type: string
minorNumber:
format: int32
type: integer
modelNumber:
type: string
mountOptions:
items:
type: string
type: array
x-kubernetes-list-type: atomic
mountpoint:
type: string
nodeName:
type: string
otherMountsInfo:
items:
properties:
mountOptions:
items:
type: string
type: array
x-kubernetes-list-type: atomic
mountpoint:
description: required
type: string
type: object
type: array
x-kubernetes-list-type: atomic
partTableType:
type: string
partTableUUID:
type: string
partitionNum:
type: integer
partitionUUID:
type: string
partitioned:
type: boolean
path:
type: string
pciPath:
type: string
physicalBlockSize:
format: int64
type: integer
readOnly:
type: boolean
rootPartition:
type: string
serialNumber:
type: string
serialNumberLong:
type: string
swapOn:
type: boolean
topology:
additionalProperties:
type: string
type: object
totalCapacity:
format: int64
type: integer
ueventFSUUID:
type: string
ueventSerial:
type: string
vendor:
type: string
virtual:
type: boolean
wwid:
type: string
required:
- path
type: object
required:
- metadata
- spec
type: object
served: true
storage: true
status:
acceptedNames:
Expand Down
Loading

0 comments on commit d4d31a3

Please sign in to comment.