Clean instance templates for untracked migs.

kubernetes · Jan 27, 2025 · 90f9447 · 90f9447
1 parent 5cd491a
commit 90f9447
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 1 deletion.
diff --git a/cluster-autoscaler/cloudprovider/gce/cache.go b/cluster-autoscaler/cloudprovider/gce/cache.go
@@ -432,6 +432,25 @@ func (gc *GceCache) InvalidateAllMigInstanceTemplates() {
 	gc.instanceTemplatesCache = map[GceRef]*gce.InstanceTemplate{}
 }
 
+// DropMigInstanceTemplatesNotFor clears the instance template
+// cache intended MIGs which are no longer present in the cluster
+func (gc *GceCache) DropInstanceTemplatesForMissingMigs(currentMigs []Mig) {
+	gc.cacheMutex.Lock()
+	defer gc.cacheMutex.Unlock()
+
+	requiredKeys := make(map[GceRef]struct{}, len(currentMigs))
+	for _, mig := range currentMigs {
+		requiredKeys[mig.GceRef()] = struct{}{}
+	}
+
+	klog.V(5).Infof("Instance template cache partially invalidated")
+	for key := range gc.instanceTemplatesCache {
+		if _, exists := requiredKeys[key]; !exists {
+			delete(gc.instanceTemplatesCache, key)
+		}
+	}
+}
+
 // GetMigKubeEnv returns the cached KubeEnv for a mig GceRef
 func (gc *GceCache) GetMigKubeEnv(ref GceRef) (KubeEnv, bool) {
 	gc.cacheMutex.Lock()

diff --git a/cluster-autoscaler/cloudprovider/gce/gce_manager.go b/cluster-autoscaler/cloudprovider/gce/gce_manager.go
@@ -306,7 +306,14 @@ func (m *gceManagerImpl) Refresh() error {
 	if m.lastRefresh.Add(refreshInterval).After(time.Now()) {
 		return nil
 	}
-	return m.forceRefresh()
+
+	if err := m.forceRefresh(); err != nil {
+		return err
+	}
+
+	migs := m.migLister.GetMigs()
+	m.cache.DropInstanceTemplatesForMissingMigs(migs)
+	return nil
 }
 
 func (m *gceManagerImpl) CreateInstances(mig Mig, delta int64) error {

diff --git a/cluster-autoscaler/cloudprovider/gce/mig_info_provider_test.go b/cluster-autoscaler/cloudprovider/gce/mig_info_provider_test.go
@@ -563,6 +563,8 @@ func TestRegenerateMigInstancesCache(t *testing.T) {
 		expectedErr                       error
 		expectedMigInstances              map[GceRef][]GceInstance
 		expectedInstancesToMig            map[GceRef]GceRef
+		expectedInstanceTemplates         map[GceRef]*gce.InstanceTemplate
+		expectedInstanceTemplateNames     map[GceRef]InstanceTemplateName
 	}{
 		{
 			name: "fill empty cache for one mig",
@@ -698,6 +700,9 @@ func TestRegenerateMigInstancesCache(t *testing.T) {
 				mig1InstancesRefs[0]: mig1.GceRef(),
 				mig1InstancesRefs[1]: mig1.GceRef(),
 			},
+			expectedInstanceTemplateNames: map[GceRef]InstanceTemplateName{
+				mig1.GceRef(): InstanceTemplateName{Name: "", Regional: false},
+			},
 		},
 		{
 			name: "bulkGceMigInstancesListingEnabled - fill empty cache for one mig - number of instances are inconsistent in bulk listing result",
@@ -724,6 +729,9 @@ func TestRegenerateMigInstancesCache(t *testing.T) {
 				mig2InstancesRefs[0]: mig2.GceRef(),
 				mig2InstancesRefs[1]: mig2.GceRef(),
 			},
+			expectedInstanceTemplateNames: map[GceRef]InstanceTemplateName{
+				mig2.GceRef(): InstanceTemplateName{Name: "", Regional: false},
+			},
 		},
 		{
 			name: "bulkGceMigInstancesListingEnabled - fill empty cache for one mig - all instances in running state",
@@ -748,6 +756,9 @@ func TestRegenerateMigInstancesCache(t *testing.T) {
 				mig2InstancesRefs[0]: mig2.GceRef(),
 				mig2InstancesRefs[1]: mig2.GceRef(),
 			},
+			expectedInstanceTemplateNames: map[GceRef]InstanceTemplateName{
+				mig2.GceRef(): InstanceTemplateName{Name: "", Regional: false},
+			},
 		},
 	}
 
@@ -766,6 +777,8 @@ func TestRegenerateMigInstancesCache(t *testing.T) {
 			if tc.expectedErr == nil {
 				assert.Equal(t, tc.expectedMigInstances, tc.cache.instances)
 				assert.Equal(t, tc.expectedInstancesToMig, tc.cache.instancesToMig)
+				assert.Equal(t, tc.expectedInstanceTemplates, tc.cache.instanceTemplatesCache)
+				assert.Equal(t, tc.expectedInstanceTemplateNames, tc.cache.instanceTemplateNameCache)
 			}
 		})
 	}