Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Update the bucket info api and add namespace to BucketAccess client #56

Merged
merged 2 commits into from
Aug 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions apis/bucket_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

type SecretS3 struct {
Endpoint string `json:"endpoint"`
Region string `json:"region"`
AccessKeyID string `json:"accessKeyID"`
AccessSecretKey string `json:"accessSecretKey"`
}

type SecretAzure struct {
AccessToken string `json:"acessToken"`
ExpiryTimeStamp *metav1.Time `json:"expiryTimeStamp"`
}

// +k8s:deepcopy-gen=false
type BucketInfo struct {
metav1.TypeMeta `json:",inline"`
Expand All @@ -42,11 +54,11 @@ type BucketInfoSpec struct {
// IAM - implicit authentication of pods to the OSP based on service account mappings
AuthenticationType AuthenticationType `json:"authenticationType"`

// Endpoint is the URL at which the bucket can be accessed
Endpoint string `json:"endpoint"`
// S3 - Details of S3 credentials
S3 *SecretS3 `json:"secretS3"`

// Region is the vendor-defined region where the bucket "resides"
Region string `json:"region"`
// Azure - Details of Azure credentials
Azure *SecretAzure `json:"secretAzure"`

// Protocols are the set of data APIs this bucket is expected to support.
// The possible values for protocol are:
Expand Down
1 change: 0 additions & 1 deletion apis/objectstorage/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ type BucketAccessClassList struct {
}

// +genclient
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:resource:scope=Namespaced
// +kubebuilder:storageversion
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 37 additions & 6 deletions client/listers/objectstorage/v1alpha1/bucketaccess.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions client/listers/objectstorage/v1alpha1/expansion_generated.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.