Skip to content

Commit f90d592

Browse files
author
Krish Chowdhary
committed
update protocol structs to remove bucketName
1 parent 0af83d5 commit f90d592

8 files changed

+106
-106
lines changed

apis/objectstorage.k8s.io/v1alpha1/azure_types.go

-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ package v1alpha1
2121
import osspec "sigs.k8s.io/container-object-storage-interface-spec"
2222

2323
type AzureProtocol struct {
24-
ContainerName string `json:"containerName,omitempty"`
2524
StorageAccount string `json:"storageAccount,omitempty"`
2625
}
2726

2827
func (azure *AzureProtocol) ConvertToExternal() *osspec.Protocol_AzureBlob {
2928
return &osspec.Protocol_AzureBlob{
3029
AzureBlob: &osspec.AzureBlob{
31-
ContainerName: azure.ContainerName,
3230
StorageAccount: azure.StorageAccount,
3331
},
3432
}
@@ -37,6 +35,5 @@ func (azure *AzureProtocol) ConvertToExternal() *osspec.Protocol_AzureBlob {
3735
func ConvertFromAzureExternal(ext *osspec.AzureBlob) *AzureProtocol {
3836
return &AzureProtocol{
3937
StorageAccount: ext.StorageAccount,
40-
ContainerName: ext.ContainerName,
4138
}
4239
}

apis/objectstorage.k8s.io/v1alpha1/gcs_types.go

-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ package v1alpha1
2121
import osspec "sigs.k8s.io/container-object-storage-interface-spec"
2222

2323
type GCSProtocol struct {
24-
BucketName string `json:"bucketName,omitempty"`
2524
PrivateKeyName string `json:"privateKeyName,omitempty"`
2625
ProjectID string `json:"projectID,omitempty"`
2726
ServiceAccount string `json:"serviceAccount,omitempty"`
@@ -30,7 +29,6 @@ type GCSProtocol struct {
3029
func (gcs *GCSProtocol) ConvertToExternal() *osspec.Protocol_Gcs {
3130
return &osspec.Protocol_Gcs{
3231
Gcs: &osspec.GCS{
33-
BucketName: gcs.BucketName,
3432
PrivateKeyName: gcs.PrivateKeyName,
3533
ProjectId: gcs.ProjectID,
3634
ServiceAccount: gcs.ServiceAccount,
@@ -40,7 +38,6 @@ func (gcs *GCSProtocol) ConvertToExternal() *osspec.Protocol_Gcs {
4038

4139
func ConvertFromGCSExternal(ext *osspec.GCS) *GCSProtocol {
4240
return &GCSProtocol{
43-
BucketName: ext.BucketName,
4441
PrivateKeyName: ext.PrivateKeyName,
4542
ProjectID: ext.ProjectId,
4643
ServiceAccount: ext.ServiceAccount,

0 commit comments

Comments
 (0)