Skip to content

Commit

Permalink
Merge pull request #198 from himanshu-kun/cherry-pick-upstream-pr-524…
Browse files Browse the repository at this point in the history
…6-on-1.24

Cherry pick upstream pr 5246 on 1.24
  • Loading branch information
elankath authored Apr 4, 2023
2 parents f34f815 + 7204bec commit 554a12a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
1 change: 1 addition & 0 deletions cluster-autoscaler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GOOS?=linux
GOARCH?=$(shell go env GOARCH)
REGISTRY?=staging-k8s.gcr.io
DOCKER_NETWORK?=default
LEADER_ELECT?=false
ifdef BUILD_TAGS
TAGS_FLAG=--tags ${BUILD_TAGS}
PROVIDER=-${BUILD_TAGS}
Expand Down
7 changes: 5 additions & 2 deletions cluster-autoscaler/expander/priority/priority.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ func NewFilter(configMapLister v1lister.ConfigMapNamespaceLister,
func (p *priority) reloadConfigMap() (priorities, *apiv1.ConfigMap, error) {
cm, err := p.configMapLister.Get(PriorityConfigMapName)
if err != nil {
return nil, nil, fmt.Errorf("Priority expander config map %s not found: %v", PriorityConfigMapName, err)
// FORK-CHANGE: logged warning to simplify debugging.
msg := fmt.Sprintf("Priority expander config map %q not found: %v", PriorityConfigMapName, err)
klog.Warning(msg)
return nil, nil, errors.New(msg)
}

prioString, found := cm.Data[ConfigMapKey]
Expand Down Expand Up @@ -123,7 +126,7 @@ func (p *priority) BestOptions(expansionOptions []expander.Option, nodeInfo map[

priorities, cm, err := p.reloadConfigMap()
if err != nil {
return nil
return expansionOptions
}

maxPrio := -1
Expand Down
20 changes: 10 additions & 10 deletions cluster-autoscaler/expander/priority/priority_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ var (
}
)

func getFilterInstance(t *testing.T, config string) (expander.Filter, *record.FakeRecorder, *apiv1.ConfigMap, error) {
func getFilterInstance(t *testing.T, config string) (expander.Filter, *record.FakeRecorder, *apiv1.ConfigMap) {
cm := &apiv1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Namespace: testNamespace,
Expand All @@ -101,41 +101,41 @@ func getFilterInstance(t *testing.T, config string) (expander.Filter, *record.Fa
assert.Nil(t, err)
r := record.NewFakeRecorder(100)
s := NewFilter(lister.ConfigMaps(testNamespace), r)
return s, r, cm, err
return s, r, cm
}

func TestPriorityExpanderCorrecltyFiltersSingleMatchingOptionOutOfOne(t *testing.T) {
s, _, _, _ := getFilterInstance(t, config)
s, _, _ := getFilterInstance(t, config)
ret := s.BestOptions([]expander.Option{eoT2Large}, nil)
assert.Equal(t, ret, []expander.Option{eoT2Large})
}

func TestPriorityExpanderCorrecltyFiltersSingleMatchingOptionOutOfMany(t *testing.T) {
s, _, _, _ := getFilterInstance(t, config)
s, _, _ := getFilterInstance(t, config)
ret := s.BestOptions([]expander.Option{eoT2Large, eoM44XLarge}, nil)
assert.Equal(t, ret, []expander.Option{eoM44XLarge})
}

func TestPriorityExpanderFiltersToHigherPriorityMatch(t *testing.T) {
s, _, _, _ := getFilterInstance(t, wildcardMatchConfig)
s, _, _ := getFilterInstance(t, wildcardMatchConfig)
ret := s.BestOptions([]expander.Option{eoT2Large, eoT2Micro}, nil)
assert.Equal(t, ret, []expander.Option{eoT2Large})
}

func TestPriorityExpanderCorrecltyFiltersTwoMatchingOptionsOutOfMany(t *testing.T) {
s, _, _, _ := getFilterInstance(t, config)
s, _, _ := getFilterInstance(t, config)
ret := s.BestOptions([]expander.Option{eoT2Large, eoT3Large, eoT2Micro}, nil)
assert.Equal(t, ret, []expander.Option{eoT2Large, eoT3Large})
}

func TestPriorityExpanderCorrecltyFallsBackToAllWhenNoMatches(t *testing.T) {
s, _, _, _ := getFilterInstance(t, config)
s, _, _ := getFilterInstance(t, config)
ret := s.BestOptions([]expander.Option{eoT2Large, eoT3Large}, nil)
assert.Equal(t, ret, []expander.Option{eoT2Large, eoT3Large})
}

func TestPriorityExpanderCorrecltyHandlesConfigUpdate(t *testing.T) {
s, r, cm, _ := getFilterInstance(t, oneEntryConfig)
s, r, cm := getFilterInstance(t, oneEntryConfig)
ret := s.BestOptions([]expander.Option{eoT2Large, eoT3Large, eoM44XLarge}, nil)
assert.Equal(t, ret, []expander.Option{eoT2Large})

Expand All @@ -154,7 +154,7 @@ func TestPriorityExpanderCorrecltyHandlesConfigUpdate(t *testing.T) {
}

func TestPriorityExpanderCorrecltySkipsBadChangeConfig(t *testing.T) {
s, r, cm, _ := getFilterInstance(t, oneEntryConfig)
s, r, cm := getFilterInstance(t, oneEntryConfig)
priority := s.(*priority)
assert.Equal(t, 0, priority.okConfigUpdates)

Expand All @@ -165,5 +165,5 @@ func TestPriorityExpanderCorrecltySkipsBadChangeConfig(t *testing.T) {

event := <-r.Events
assert.EqualValues(t, configWarnConfigMapEmpty, event)
assert.Empty(t, ret)
assert.Equal(t, ret, []expander.Option{eoT2Large, eoT3Large, eoM44XLarge})
}

0 comments on commit 554a12a

Please sign in to comment.