opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): skip sync apsara expired time (#19580)

Browse Source
This commit is contained in:
屈轩
2024-02-29 16:08:14 +08:00
committed by GitHub
parent b8db3e5f09
commit cb77c0e21f
9 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -88,7 +88,7 @@ require (
k8s.io/client-go v0.19.3
k8s.io/cluster-bootstrap v0.19.3
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240228093952-8fe0cab9f903
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361
go.sum
+2 -2
View File
@@ -1204,8 +1204,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240228093952-8fe0cab9f903 h1:dBGEplbtz3+5Vfv7f1El0rlV2u9849no3Lj5uww7ZC4=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240228093952-8fe0cab9f903/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0 h1:scJplFoiYEykGxZF1Eg8CtTTk2vha108PnDHW0n/1Ss=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1473,7 +1473,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit; go 1.12
sigs.k8s.io/yaml
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240228093952-8fe0cab9f903
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240229080300-a5989f4029b0
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/dbinstance.go
Generated Vendored
-4
View File
@@ -166,10 +166,6 @@ func (rds *SDBInstance) GetBillingType() string {
return convertChargeType(rds.PayType)
}
func (rds *SDBInstance) GetExpiredAt() time.Time {
return rds.ExpireTime
}
func (rds *SDBInstance) GetCreatedAt() time.Time {
return rds.CreateTime
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/disk.go
Generated Vendored
-4
View File
@@ -408,10 +408,6 @@ func (self *SDisk) GetCreatedAt() time.Time {
return self.CreationTime
}
func (self *SDisk) GetExpiredAt() time.Time {
return convertExpiredAt(self.ExpiredTime)
}
func (self *SDisk) GetAccessPath() string {
return ""
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/eip.go
Generated Vendored
-4
View File
@@ -175,10 +175,6 @@ func (self *SEipAddress) GetCreatedAt() time.Time {
return self.AllocationTime
}
func (self *SEipAddress) GetExpiredAt() time.Time {
return convertExpiredAt(self.ExpiredTime)
}
func (self *SEipAddress) Delete() error {
return self.region.DeallocateEIP(self.AllocationId)
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/elasticcache_instance.go
Generated Vendored
-4
View File
@@ -201,10 +201,6 @@ func (self *SElasticcache) GetCreatedAt() time.Time {
return self.CreateTime
}
func (self *SElasticcache) GetExpiredAt() time.Time {
return convertExpiredAt(self.EndTime)
}
func (self *SElasticcache) GetInstanceType() string {
return self.InstanceClass
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/instance.go
Generated Vendored
-4
View File
@@ -901,10 +901,6 @@ func (self *SInstance) GetCreatedAt() time.Time {
return self.CreationTime
}
func (self *SInstance) GetExpiredAt() time.Time {
return convertExpiredAt(self.ExpiredTime)
}
func (self *SInstance) UpdateUserData(userData string) error {
return self.host.zone.region.updateInstance(self.InstanceId, "", "", "", "", userData)
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/natgateway.go
Generated Vendored
-4
View File
@@ -110,10 +110,6 @@ func (nat *SNatGetway) GetCreatedAt() time.Time {
return nat.CreationTime
}
func (nat *SNatGetway) GetExpiredAt() time.Time {
return nat.ExpiredTime
}
func (nat *SNatGetway) GetIEips() ([]cloudprovider.ICloudEIP, error) {
eips := []SEipAddress{}
for {