Update API based on latest spec

 - remove anonymous access mode from bucket and bucketclass
 - refactor package

Author: wlan0

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

@@ -21,63 +21,81 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-type BucketRequestSpec struct {
-	// +optional
-	BucketInstanceName string `json:"bucketInstanceName,omitempty"`
-	// +optional
-	BucketPrefix string `json:"bucketPrefix,omitempty"`
-	// +optional
-	BucketClassName string `json:"bucketClassName,omitempty"`
-}
+func init() {
+	SchemeBuilder.Register(&Bucket{}, &BucketList{})
+	SchemeBuilder.Register(&BucketRequest{}, &BucketRequestList{})
+	SchemeBuilder.Register(&BucketClass{}, &BucketClassList{})
 
-type BucketRequestStatus struct {
-	// +optional
-	Message string `json:"message,omitempty"`
-	// +optional
-	BucketAvailable bool `json:"bucketAvailable"`
+	SchemeBuilder.Register(&BucketAccess{}, &BucketAccessList{})
+	SchemeBuilder.Register(&BucketAccessRequest{}, &BucketAccessRequestList{})
+	SchemeBuilder.Register(&BucketAccessClass{}, &BucketAccessClassList{})
 }
 
-type AnonymousAccessMode struct {
-	// +optional
-	Private bool `json:"private,omitempty"`
-	// +optional
-	PublicReadOnly bool `json:"publicReadOnly,omitempty"`
+type RetentionPolicy string
+
+const (
+	RetentionPolicyRetain RetentionPolicy = "Retain"
+	RetentionPolicyDelete RetentionPolicy = "Delete"
+)
+
+// +genclient
+// +genclient:nonNamespaced
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+
+type Bucket struct {
+	metav1.TypeMeta `json:",inline"`
 	// +optional
-	PublicReadWrite bool `json:"publicReadWrite,omitempty"`
+
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec BucketSpec `json:"spec,omitempty"`
+
 	// +optional
-	PublicWriteOnly bool `json:"publicWriteOnly,omitempty"`
+	Status BucketStatus `json:"status,omitempty"`
 }
 
 type BucketSpec struct {
 	// +optional
 	Provisioner string `json:"provisioner,omitempty"`
-	// +kubebuilder:default:=retain
-	RetentionPolicy RetentionPolicy `json:"retentionPolicy"`
-	// +optional
-	AnonymousAccessMode AnonymousAccessMode `json:"anonymousAccessMode,omitempty"`
+
 	// +optional
-	BucketClassName string                  `json:"bucketClassName,omitempty"`
-	BucketRequest   *corev1.ObjectReference `json:"bucketRequest,omitempty"`
+	BucketClassName string `json:"bucketClassName,omitempty"`
+
+	BucketRequest *corev1.ObjectReference `json:"bucketRequest,omitempty"`
+
 	// +listType=atomic
 	AllowedNamespaces []string `json:"allowedNamespaces,omitempty"`
-	Protocol          Protocol `json:"protocol"`
+
+	Protocol Protocol `json:"protocol"`
+
+	// +optional
+	BucketID string `json:"bucketID,omitempty"`
+
 	// +optional
 	Parameters map[string]string `json:"parameters,omitempty"`
+
+	// +kubebuilder:default:=retain
+	RetentionPolicy RetentionPolicy `json:"retentionPolicy"`
 }
 
 type BucketStatus struct {
 	// +optional
 	Message string `json:"message,omitempty"`
+
 	// +optional
 	BucketAvailable bool `json:"bucketAvailable,omitempty"`
 }
 
-type RetentionPolicy string
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-const (
-	RetentionPolicyRetain RetentionPolicy = "Retain"
-	RetentionPolicyDelete RetentionPolicy = "Delete"
-)
+type BucketList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Bucket `json:"items"`
+}
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -88,42 +106,40 @@ const (
 type BucketRequest struct {
 	metav1.TypeMeta `json:",inline"`
 	// +optional
+
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              BucketRequestSpec `json:"spec,omitempty"`
+
+	Spec BucketRequestSpec `json:"spec,omitempty"`
+
 	// +optional
 	Status BucketRequestStatus `json:"status,omitempty"`
 }
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type BucketRequestSpec struct {
+	// +optional
+	BucketInstanceName string `json:"bucketInstanceName,omitempty"`
 
-type BucketRequestList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []BucketRequest `json:"items"`
-}
+	// +optional
+	BucketPrefix string `json:"bucketPrefix,omitempty"`
 
-// +genclient
-// +genclient:nonNamespaced
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:resource:scope=Cluster
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
+	// +optional
+	BucketClassName string `json:"bucketClassName,omitempty"`
+}
 
-type Bucket struct {
-	metav1.TypeMeta `json:",inline"`
+type BucketRequestStatus struct {
 	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              BucketSpec `json:"spec,omitempty"`
+	Message string `json:"message,omitempty"`
+
 	// +optional
-	Status BucketStatus `json:"status,omitempty"`
+	BucketAvailable bool `json:"bucketAvailable"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-type BucketList struct {
+type BucketRequestList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Bucket `json:"items"`
+	Items           []BucketRequest `json:"items"`
 }
 
 // +genclient
@@ -135,24 +151,27 @@ type BucketList struct {
 
 type BucketClass struct {
 	metav1.TypeMeta `json:",inline"`
+
 	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
+	Provisioner string `json:"provisioner,omitempty"`
+
 	// +optional
 	// +kubebuilder:default:=false
 	IsDefaultBucketClass bool `json:"isDefaultBucketClass,omitempty"`
+
 	// +listType=atomic
 	// +optional
 	AllowedNamespaces []string `json:"allowedNamespaces,omitempty"`
-	Protocol          Protocol `json:"protocol"`
-	// +optional
-	AnonymousAccessMode AnonymousAccessMode `json:"anonymousAccessMode,omitempty"`
+
+	Protocol Protocol `json:"protocol"`
+
 	// +kubebuilder:default:=retain
 	RetentionPolicy RetentionPolicy `json:"retentionPolicy,omitempty"`
+
 	// +optional
 	Parameters map[string]string `json:"parameters,omitempty"`
-	// +optional
-	Provisioner string `json:"provisioner,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -172,11 +191,15 @@ type BucketClassList struct {
 
 type BucketAccessClass struct {
 	metav1.TypeMeta `json:",inline"`
+
 	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
+
 	// +optional
-	Provisioner            string                  `json:"provisioner,omitempty"`
+	Provisioner string `json:"provisioner,omitempty"`
+
 	PolicyActionsConfigMap *corev1.ObjectReference `json:"policyActionsConfigMap,omitempty"`
+
 	// +optional
 	Parameters map[string]string `json:"parameters,omitempty"`
 }
@@ -189,84 +212,102 @@ type BucketAccessClassList struct {
 	Items           []BucketAccessClass `json:"items"`
 }
 
+// +genclient
+// +genclient:nonNamespaced
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:storageversion
+// +kubebuilder:subresource:status
+
+type BucketAccess struct {
+	metav1.TypeMeta `json:",inline"`
+
+	// +optional
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec BucketAccessSpec `json:"spec,omitempty"`
+
+	// +optional
+	Status BucketAccessStatus `json:"status"`
+}
+
 type BucketAccessSpec struct {
+	// +optional
+	Provisioner string `json:"provisioner,omitempty"`
+
 	// +optional
 	BucketInstanceName string `json:"bucketInstanceName,omitempty"`
+
 	// +optional
 	BucketAccessRequest *corev1.ObjectReference `json:"bucketAccessRequest,omitempty"`
+
 	// +optional
 	ServiceAccount *corev1.ObjectReference `json:"serviceAccount,omitempty"`
+
 	// +optional
-	MintedSecretName           string `json:"mintedSecretName,omitempty"`
+	MintedSecretName string `json:"mintedSecretName,omitempty"`
+
 	PolicyActionsConfigMapData string `json:"policyActionsConfigMapData,omitempty"`
+
 	// +optional
 	Principal string `json:"principal,omitempty"`
-	// +optional
-	Provisioner string `json:"provisioner,omitempty"`
+
 	// +optional
 	Parameters map[string]string `json:"parameters,omitempty"`
 }
 
 type BucketAccessStatus struct {
 	// +optional
 	Message string `json:"message,omitempty"`
+
 	// +optional
 	AccessGranted bool `json:"accessGranted,omitempty"`
 }
 
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type BucketAccessList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []BucketAccess `json:"items"`
+}
+
 // +genclient
-// +genclient:nonNamespaced
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:resource:scope=Cluster
+// +kubebuilder:resource:scope=Namespaced
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 
-type BucketAccess struct {
+type BucketAccessRequest struct {
 	metav1.TypeMeta `json:",inline"`
+
 	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              BucketAccessSpec `json:"spec,omitempty"`
-	// +optional
-	Status BucketAccessStatus `json:"status"`
-}
 
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+	Spec BucketAccessRequestSpec `json:"spec,omitempty"`
 
-type BucketAccessList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []BucketAccess `json:"items"`
+	// +optional
+	Status BucketAccessRequestStatus `json:"status"`
 }
 
 type BucketAccessRequestSpec struct {
 	// +optional
-	ServiceAccountName    string `json:"serviceAccountName,omitempty"`
-	BucketRequestName     string `json:"bucketRequestName"`
+	ServiceAccountName string `json:"serviceAccountName,omitempty"`
+
+	BucketRequestName string `json:"bucketRequestName"`
+
 	BucketAccessClassName string `json:"bucketAccessClassName"`
+
 	// +optional
 	BucketAccessName string `json:"bucketAccessName,omitempty"`
 }
 
 type BucketAccessRequestStatus struct {
 	// +optional
 	Message string `json:"message,omitempty"`
-	// +optional
-	AccessGranted bool `json:"accessGranted"`
-}
 
-// +genclient
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +kubebuilder:resource:scope=Namespaced
-// +kubebuilder:storageversion
-// +kubebuilder:subresource:status
-
-type BucketAccessRequest struct {
-	metav1.TypeMeta `json:",inline"`
-	// +optional
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              BucketAccessRequestSpec `json:"spec,omitempty"`
 	// +optional
-	Status BucketAccessRequestStatus `json:"status"`
+	AccessGranted bool `json:"accessGranted"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -276,13 +317,3 @@ type BucketAccessRequestList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []BucketAccessRequest `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&Bucket{}, &BucketList{})
-	SchemeBuilder.Register(&BucketRequest{}, &BucketRequestList{})
-	SchemeBuilder.Register(&BucketClass{}, &BucketClassList{})
-
-	SchemeBuilder.Register(&BucketAccess{}, &BucketAccessList{})
-	SchemeBuilder.Register(&BucketAccessRequest{}, &BucketAccessRequestList{})
-	SchemeBuilder.Register(&BucketAccessClass{}, &BucketAccessClassList{})
-}