update spec and fix leader election retry interval

wlan0 · wlan0 · commit ca0accbdd75e · 2021-03-29T23:21:55.000-07:00
diff --git a/apis/objectstorage.k8s.io/v1alpha1/azure_types.go b/apis/objectstorage.k8s.io/v1alpha1/azure_types.go
@@ -27,14 +27,14 @@ type AzureProtocol struct {
 
 func (azure *AzureProtocol) ConvertToExternal() *osspec.Protocol_AzureBlob {
 	return &osspec.Protocol_AzureBlob{
-		AzureBlob: &osspec.AzureBlobParameters{
+		AzureBlob: &osspec.AzureBlob{
 			ContainerName:  azure.ContainerName,
 			StorageAccount: azure.StorageAccount,
 		},
 	}
 }
 
-func ConvertFromAzureExternal(ext *osspec.AzureBlobParameters) *AzureProtocol {
+func ConvertFromAzureExternal(ext *osspec.AzureBlob) *AzureProtocol {
 	return &AzureProtocol{
 		StorageAccount: ext.StorageAccount,
 		ContainerName: ext.ContainerName,
diff --git a/apis/objectstorage.k8s.io/v1alpha1/gcs_types.go b/apis/objectstorage.k8s.io/v1alpha1/gcs_types.go
@@ -29,7 +29,7 @@ type GCSProtocol struct {
 
 func (gcs *GCSProtocol) ConvertToExternal() *osspec.Protocol_Gcs {
 	return &osspec.Protocol_Gcs{
-		Gcs: &osspec.GCSParameters{
+		Gcs: &osspec.GCS{
 			BucketName:     gcs.BucketName,
 			PrivateKeyName: gcs.PrivateKeyName,
 			ProjectId:      gcs.ProjectID,
@@ -38,7 +38,7 @@ func (gcs *GCSProtocol) ConvertToExternal() *osspec.Protocol_Gcs {
 	}
 }
 
-func ConvertFromGCSExternal(ext *osspec.GCSParameters) *GCSProtocol {
+func ConvertFromGCSExternal(ext *osspec.GCS) *GCSProtocol {
 	return &GCSProtocol{
 		BucketName:     ext.BucketName,
 		PrivateKeyName: ext.PrivateKeyName,
diff --git a/apis/objectstorage.k8s.io/v1alpha1/s3_types.go b/apis/objectstorage.k8s.io/v1alpha1/s3_types.go
@@ -44,7 +44,7 @@ func (s3 *S3Protocol) ConvertToExternal() *osspec.Protocol_S3 {
 		sigver = 0
 	}
 	return &osspec.Protocol_S3{
-		S3: &osspec.S3Parameters{
+		S3: &osspec.S3{
 			Endpoint:         s3.Endpoint,
 			BucketName:       s3.BucketName,
 			Region:           s3.Region,
@@ -53,7 +53,7 @@ func (s3 *S3Protocol) ConvertToExternal() *osspec.Protocol_S3 {
 	}
 }
 
-func ConvertFromS3External(ext *osspec.S3Parameters) *S3Protocol {
+func ConvertFromS3External(ext *osspec.S3) *S3Protocol {
 	vers, ok := osspec.S3SignatureVersion_name[int32(ext.SignatureVersion)]
 	if !ok {
 		vers = osspec.S3SignatureVersion_name[0]
diff --git a/controller/controller.go b/controller/controller.go
@@ -159,8 +159,8 @@ func NewObjectStorageControllerWithClientset(identity string, leaderLockName str
 		ResyncPeriod: 30 * time.Second,
 		// leader election
 		LeaseDuration: 60 * time.Second,
-		RenewDeadline: 15 * time.Second,
-		RetryPeriod:   5 * time.Second,
+		RenewDeadline: 30 * time.Second,
+		RetryPeriod:   15 * time.Second,
 
 		opMap: &sync.Map{},
 	}, nil
diff --git a/go.mod b/go.mod
@@ -13,6 +13,6 @@ require (
 	k8s.io/apimachinery v0.19.4
 	k8s.io/client-go v0.19.4
 	k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
-	sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210224211525-dfa3af562c18
+	sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19
 	sigs.k8s.io/controller-runtime v0.6.3
 )
diff --git a/go.sum b/go.sum
@@ -617,6 +617,8 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
 sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210224211525-dfa3af562c18 h1:TIx7kV6/3ZSQ5BETBx1QG1Va28zv1LZAvqRjs28n8ss=
 sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210224211525-dfa3af562c18/go.mod h1:kafkL5l/lTUrZXhVi/9p1GzpEE/ts29BkWkL3Ao33WU=
+sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19 h1:LrLrBCBqO7O/VjJtTrDSj3/f7hLSQaCIouLZFnHGxFg=
+sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19/go.mod h1:kafkL5l/lTUrZXhVi/9p1GzpEE/ts29BkWkL3Ao33WU=
 sigs.k8s.io/controller-runtime v0.6.3 h1:SBbr+inLPEKhvlJtrvDcwIpm+uhDvp63Bl72xYJtoOE=
 sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (s3 S3Protocol) ConvertToExternal() osspec.Protocol_S3 {`
`44`	`44`	`sigver = 0`
`45`	`45`	`}`
`46`	`46`	`return &osspec.Protocol_S3{`
`47`		`- S3: &osspec.S3Parameters{`
	`47`	`+ S3: &osspec.S3{`
`48`	`48`	`Endpoint: s3.Endpoint,`
`49`	`49`	`BucketName: s3.BucketName,`
`50`	`50`	`Region: s3.Region,`
`@@ -53,7 +53,7 @@ func (s3 S3Protocol) ConvertToExternal() osspec.Protocol_S3 {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`-func ConvertFromS3External(ext osspec.S3Parameters) S3Protocol {`
	`56`	`+func ConvertFromS3External(ext osspec.S3) S3Protocol {`
`57`	`57`	`vers, ok := osspec.S3SignatureVersion_name[int32(ext.SignatureVersion)]`
`58`	`58`	`if !ok {`
`59`	`59`	`vers = osspec.S3SignatureVersion_name[0]`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ require (`
`13`	`13`	`k8s.io/apimachinery v0.19.4`
`14`	`14`	`k8s.io/client-go v0.19.4`
`15`	`15`	`k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488`
`16`		`- sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210224211525-dfa3af562c18`
	`16`	`+ sigs.k8s.io/container-object-storage-interface-spec v0.0.0-20210329232956-3bbacbbc9c19`
`17`	`17`	`sigs.k8s.io/controller-runtime v0.6.3`
`18`	`18`	`)`