Merge pull request #425 from shapeblue/fixup-client-cache-key

k8s-ci-robot · web-flow · commit 16d5e02b16b0 · 2025-03-21T02:52:32.000-07:00
Fixup cache key for projects
diff --git a/pkg/cloud/client.go b/pkg/cloud/client.go
@@ -160,7 +160,7 @@ func NewClientFromConf(conf Config, clientConfig *corev1.ConfigMap, project stri
 		clientCache = newClientCache(clientConfig)
 	}
 
-	clientCacheKey := generateClientCacheKey(conf)
+	clientCacheKey := generateClientCacheKey(conf, project)
 	if item := clientCache.Get(clientCacheKey); item != nil {
 		return item.Value(), nil
 	}
@@ -252,8 +252,8 @@ func NewClientFromCSAPIClient(cs *cloudstack.CloudStackClient, user *User) Clien
 }
 
 // generateClientCacheKey generates a cache key from a Config
-func generateClientCacheKey(conf Config) string {
-	return fmt.Sprintf("%+v", conf)
+func generateClientCacheKey(conf Config, project string) string {
+	return fmt.Sprintf("%s-%+v", project, conf)
 }
 
 // newClientCache returns a new instance of client cache

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func NewClientFromConf(conf Config, clientConfig *corev1.ConfigMap, project stri`
`160`	`160`	`clientCache = newClientCache(clientConfig)`
`161`	`161`	`}`
`162`	`162`
`163`		`- clientCacheKey := generateClientCacheKey(conf)`
	`163`	`+ clientCacheKey := generateClientCacheKey(conf, project)`
`164`	`164`	`if item := clientCache.Get(clientCacheKey); item != nil {`
`165`	`165`	`return item.Value(), nil`
`166`	`166`	`}`
`@@ -252,8 +252,8 @@ func NewClientFromCSAPIClient(cs cloudstack.CloudStackClient, user User) Clien`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`// generateClientCacheKey generates a cache key from a Config`
`255`		`-func generateClientCacheKey(conf Config) string {`
`256`		`- return fmt.Sprintf("%+v", conf)`
	`255`	`+func generateClientCacheKey(conf Config, project string) string {`
	`256`	`+ return fmt.Sprintf("%s-%+v", project, conf)`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`// newClientCache returns a new instance of client cache`