use bucketName instead of bucketName and bucketInstanceName

Author: wlan0

Diff for: apis/objectstorage.k8s.io/v1alpha1/openapi_generated.go

@@ -117,9 +117,6 @@ type BucketRequest struct {
 }
 
 type BucketRequestSpec struct {
-	// +optional
-	BucketInstanceName string `json:"bucketInstanceName,omitempty"`
-
 	// +optional
 	BucketPrefix string `json:"bucketPrefix,omitempty"`
 
@@ -133,6 +130,9 @@ type BucketRequestStatus struct {
 
 	// +optional
 	BucketAvailable bool `json:"bucketAvailable"`
+
+	// +optional
+	BucketName string `json:"bucketName,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -231,7 +231,7 @@ type BucketAccess struct {
 
 type BucketAccessSpec struct {
 	// +optional
-	BucketInstanceName string `json:"bucketInstanceName,omitempty"`
+	BucketName string `json:"bucketName,omitempty"`
 
 	// +optional
 	BucketAccessRequest *corev1.ObjectReference `json:"bucketAccessRequest,omitempty"`
@@ -288,13 +288,12 @@ type BucketAccessRequest struct {
 type BucketAccessRequestSpec struct {
 	// +optional
 	ServiceAccountName string `json:"serviceAccountName,omitempty"`
-
-	BucketRequestName string `json:"bucketRequestName"`
+	// +optional
+	BucketRequestName string `json:"bucketRequestName,omitempty"`
+	// +optional
+	BucketName string `json:"bucketName,omitempty"`
 
 	BucketAccessClassName string `json:"bucketAccessClassName"`
-
-	// +optional
-	BucketAccessName string `json:"bucketAccessName,omitempty"`
 }
 
 type BucketAccessRequestStatus struct {
@@ -303,6 +302,9 @@ type BucketAccessRequestStatus struct {
 
 	// +optional
 	AccessGranted bool `json:"accessGranted"`
+
+	// +optional
+	BucketAccessName string `json:"bucketAccessName,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

Diff for: apis/objectstorage.k8s.io/v1alpha1/types.go

@@ -93,7 +93,7 @@ spec:
                     description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
                     type: string
                 type: object
-              bucketInstanceName:
+              bucketName:
                 type: string
               mintedSecretName:
                 type: string

Diff for: crds/objectstorage.k8s.io_bucketaccesses.yaml

@@ -36,20 +36,21 @@ spec:
             properties:
               bucketAccessClassName:
                 type: string
-              bucketAccessName:
+              bucketName:
                 type: string
               bucketRequestName:
                 type: string
               serviceAccountName:
                 type: string
             required:
             - bucketAccessClassName
-            - bucketRequestName
             type: object
           status:
             properties:
               accessGranted:
                 type: boolean
+              bucketAccessName:
+                type: string
               message:
                 type: string
             type: object

Diff for: crds/objectstorage.k8s.io_bucketaccessrequests.yaml

@@ -36,15 +36,15 @@ spec:
             properties:
               bucketClassName:
                 type: string
-              bucketInstanceName:
-                type: string
               bucketPrefix:
                 type: string
             type: object
           status:
             properties:
               bucketAvailable:
                 type: boolean
+              bucketName:
+                type: string
               message:
                 type: string
             type: object