Skip to content

Commit

Permalink
Update/csv (#32)
Browse files Browse the repository at this point in the history
* add description for the types

* update the chart version

* update csv

* update alm examples and csv descriptions
  • Loading branch information
hoptical authored Jan 19, 2024
1 parent 202dfbf commit b3c3db6
Show file tree
Hide file tree
Showing 11 changed files with 54 additions and 46 deletions.
2 changes: 1 addition & 1 deletion api/v1alpha1/s3bucket_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type S3BucketStatus struct {
// +kubebuilder:printcolumn:name="S3USERREF",type=string,JSONPath=`.spec.s3UserRef`
// +kubebuilder:resource:shortName=s3b

// S3Bucket is the Schema for the s3buckets API
// S3 Bucket Instance
type S3Bucket struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/s3user_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ type S3UserStatus struct {
// +kubebuilder:printcolumn:name="MAX BUCKETS",type=string,JSONPath=`.spec.quota.maxBuckets`
// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=`.metadata.creationTimestamp`

// S3 User is created by the S3 User Claim instance. It's not applicable for the operator user.
type S3User struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/s3userclaim_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ type S3UserClaimStatus struct {
// +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=`.metadata.creationTimestamp`
// +kubebuilder:resource:shortName=s3u

// S3 User Claim Instance
type S3UserClaim struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
4 changes: 2 additions & 2 deletions charts/ceph-s3-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.0
version: 0.3.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.1.0"
appVersion: "v0.3.6"
2 changes: 1 addition & 1 deletion config/crd/bases/s3.snappcloud.io_s3buckets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
description: S3Bucket is the Schema for the s3buckets API
description: S3 Bucket Instance
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand Down
1 change: 1 addition & 0 deletions config/crd/bases/s3.snappcloud.io_s3userclaims.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
description: S3 User Claim Instance
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand Down
2 changes: 2 additions & 0 deletions config/crd/bases/s3.snappcloud.io_s3users.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ spec:
name: v1alpha1
schema:
openAPIV3Schema:
description: S3 User is created by the S3 User Claim instance. It's not applicable
for the operator user.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand Down
66 changes: 36 additions & 30 deletions config/manifests/bases/ceph-s3-operator.clusterserviceversion.yaml

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions config/samples/s3_v1alpha1_s3bucket.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: s3.snappcloud.io/v1alpha1
kind: S3Bucket
metadata:
labels:
app.kubernetes.io/name: s3bucket
app.kubernetes.io/instance: s3bucket-sample
app.kubernetes.io/part-of: ceph-s3-operator
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/created-by: ceph-s3-operator
name: s3bucket-sample
namespace: ceph-s3-operator-test
spec:
s3UserRef: s3userclaim-sample
s3DeletionPolicy: delete
s3SubuserBinding:
- name: subuser1
access: write
- name: subuser2
access: read
6 changes: 0 additions & 6 deletions config/samples/s3_v1alpha1_s3user.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
apiVersion: s3.snappcloud.io/v1alpha1
kind: S3User
metadata:
labels:
app.kubernetes.io/name: s3user
app.kubernetes.io/instance: s3user-sample
app.kubernetes.io/part-of: ceph-s3-operator
app.kubernetes.io/managed-by: kustomize
app.kubernetes.io/created-by: ceph-s3-operator
name: s3user-sample
spec:
# TODO(user): Add fields here
3 changes: 3 additions & 0 deletions config/samples/s3_v1alpha1_s3userclaim.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ spec:
maxSize: 1000
maxObjects: 1000
maxBuckets: 5
subusers:
- subuser1
- subuser2

0 comments on commit b3c3db6

Please sign in to comment.