Skip to content

Commit b3c3db6

Browse files
authored
Update/csv (#32)
* add description for the types * update the chart version * update csv * update alm examples and csv descriptions
1 parent 202dfbf commit b3c3db6

11 files changed

+54
-46
lines changed

api/v1alpha1/s3bucket_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type S3BucketStatus struct {
5252
// +kubebuilder:printcolumn:name="S3USERREF",type=string,JSONPath=`.spec.s3UserRef`
5353
// +kubebuilder:resource:shortName=s3b
5454

55-
// S3Bucket is the Schema for the s3buckets API
55+
// S3 Bucket Instance
5656
type S3Bucket struct {
5757
metav1.TypeMeta `json:",inline"`
5858
metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha1/s3user_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ type S3UserStatus struct {
4848
// +kubebuilder:printcolumn:name="MAX BUCKETS",type=string,JSONPath=`.spec.quota.maxBuckets`
4949
// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=`.metadata.creationTimestamp`
5050

51+
// S3 User is created by the S3 User Claim instance. It's not applicable for the operator user.
5152
type S3User struct {
5253
metav1.TypeMeta `json:",inline"`
5354
metav1.ObjectMeta `json:"metadata,omitempty"`

api/v1alpha1/s3userclaim_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ type S3UserClaimStatus struct {
6161
// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=`.metadata.creationTimestamp`
6262
// +kubebuilder:resource:shortName=s3u
6363

64+
// S3 User Claim Instance
6465
type S3UserClaim struct {
6566
metav1.TypeMeta `json:",inline"`
6667
metav1.ObjectMeta `json:"metadata,omitempty"`

charts/ceph-s3-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ type: application
1313
# This is the chart version. This version number should be incremented each time you make changes
1414
# to the chart and its templates, including the app version.
1515
# Versions are expected to follow Semantic Versioning (https://semver.org/)
16-
version: 0.1.0
16+
version: 0.3.0
1717
# This is the version number of the application being deployed. This version number should be
1818
# incremented each time you make changes to the application. Versions are not expected to
1919
# follow Semantic Versioning. They should reflect the version the application is using.
2020
# It is recommended to use it with quotes.
21-
appVersion: "0.1.0"
21+
appVersion: "v0.3.6"

config/crd/bases/s3.snappcloud.io_s3buckets.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
name: v1alpha1
2525
schema:
2626
openAPIV3Schema:
27-
description: S3Bucket is the Schema for the s3buckets API
27+
description: S3 Bucket Instance
2828
properties:
2929
apiVersion:
3030
description: 'APIVersion defines the versioned schema of this representation

config/crd/bases/s3.snappcloud.io_s3userclaims.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ spec:
3939
name: v1alpha1
4040
schema:
4141
openAPIV3Schema:
42+
description: S3 User Claim Instance
4243
properties:
4344
apiVersion:
4445
description: 'APIVersion defines the versioned schema of this representation

config/crd/bases/s3.snappcloud.io_s3users.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ spec:
4040
name: v1alpha1
4141
schema:
4242
openAPIV3Schema:
43+
description: S3 User is created by the S3 User Claim instance. It's not applicable
44+
for the operator user.
4345
properties:
4446
apiVersion:
4547
description: 'APIVersion defines the versioned schema of this representation

config/manifests/bases/ceph-s3-operator.clusterserviceversion.yaml

Lines changed: 36 additions & 30 deletions
Large diffs are not rendered by default.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: s3.snappcloud.io/v1alpha1
22
kind: S3Bucket
33
metadata:
4-
labels:
5-
app.kubernetes.io/name: s3bucket
6-
app.kubernetes.io/instance: s3bucket-sample
7-
app.kubernetes.io/part-of: ceph-s3-operator
8-
app.kubernetes.io/managed-by: kustomize
9-
app.kubernetes.io/created-by: ceph-s3-operator
104
name: s3bucket-sample
5+
namespace: ceph-s3-operator-test
116
spec:
127
s3UserRef: s3userclaim-sample
138
s3DeletionPolicy: delete
9+
s3SubuserBinding:
10+
- name: subuser1
11+
access: write
12+
- name: subuser2
13+
access: read
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
apiVersion: s3.snappcloud.io/v1alpha1
22
kind: S3User
33
metadata:
4-
labels:
5-
app.kubernetes.io/name: s3user
6-
app.kubernetes.io/instance: s3user-sample
7-
app.kubernetes.io/part-of: ceph-s3-operator
8-
app.kubernetes.io/managed-by: kustomize
9-
app.kubernetes.io/created-by: ceph-s3-operator
104
name: s3user-sample
115
spec:
126
# TODO(user): Add fields here

config/samples/s3_v1alpha1_s3userclaim.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ spec:
1111
maxSize: 1000
1212
maxObjects: 1000
1313
maxBuckets: 5
14+
subusers:
15+
- subuser1
16+
- subuser2

0 commit comments

Comments
 (0)