cleanups and remove bucket reconciliation for now

daanvinken · Nov 13, 2023 · af2465f · af2465f
1 parent e4140c2
commit af2465f
Show file tree

Hide file tree

Showing 28 changed files with 103 additions and 1,491 deletions.
diff --git a/apis/ceph/v1alpha1/cephuser_types.go b/apis/ceph/v1alpha1/cephuser_types.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	"reflect"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -32,19 +31,16 @@ type CephUserParameters struct {
 	UID *string `json:"uid"`
 
 	// The displayed name
-	DisplayedName *string `json:"displayed_name"`
+	DisplayedName *string `json:"displayedName"`
 
 	// The max number of objects allowed for this user
-	UserQuotaMaxBuckets *int `json:"user_quota_max_buckets"`
+	UserQuotaMaxBuckets *int `json:"userQuotaMaxBuckets"`
 
 	// The maximum storage size (total) in MB
-	UserQuotaMaxSizeKB *int `json:"user_quota_max_size_kb"`
+	UserQuotaMaxSizeKB *int `json:"userQuotaMaxSizeKB"`
 
 	// The number of objects for this user
-	UserQuotaMaxObjects *int64 `json:"user_quota_max_objects"`
-
-	// The name of the secreet containing S3 credentials for this user
-	CredentialsSecretName *string `json:"credentialsSecretName,omitempty"`
+	UserQuotaMaxObjects *int64 `json:"userQuotaMaxObjects"`
 }
 
 // CephUserObservation are the observable fields of a CephUser.
@@ -54,9 +50,8 @@ type CephUserObservation struct {
 
 // A CephUserSpec defines the desired state of a CephUser.
 type CephUserSpec struct {
-	xpv1.ResourceSpec    `json:",inline"`
-	ForProvider          CephUserParameters          `json:"forProvider"`
-	CredentialsSecretRef corev1.LocalObjectReference `json:"credentialsSecretRef,omitempty"`
+	xpv1.ResourceSpec `json:",inline"`
+	ForProvider       CephUserParameters `json:"forProvider"`
 }
 
 // A CephUserStatus represents the observed state of a CephUser.

diff --git a/apis/ceph/v1alpha1/zz_generated.deepcopy.go b/apis/ceph/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/radosgw.go b/apis/radosgw.go
@@ -21,7 +21,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 
 	cephv1alpha1 "github.com/daanvinken/provider-radosgw/apis/ceph/v1alpha1"
-	s3v1alpha "github.com/daanvinken/provider-radosgw/apis/s3/v1alpha1"
 	radosgwv1alpha1 "github.com/daanvinken/provider-radosgw/apis/v1alpha1"
 )
 
@@ -30,7 +29,6 @@ func init() {
 	AddToSchemes = append(AddToSchemes,
 		radosgwv1alpha1.SchemeBuilder.AddToScheme,
 		cephv1alpha1.SchemeBuilder.AddToScheme,
-		s3v1alpha.SchemeBuilder.AddToScheme,
 	)
 }
 

diff --git a/apis/s3/s3.go b/apis/s3/s3.go
diff --git a/apis/s3/v1alpha1/bucket_types.go b/apis/s3/v1alpha1/bucket_types.go
diff --git a/apis/s3/v1alpha1/doc.go b/apis/s3/v1alpha1/doc.go
diff --git a/apis/s3/v1alpha1/groupversion_info.go b/apis/s3/v1alpha1/groupversion_info.go