Skip to content

Commit

Permalink
fix: volumeMount duplicated (#7696)
Browse files Browse the repository at this point in the history
(cherry picked from commit 4544ef6)
  • Loading branch information
sophon-zt committed Jul 2, 2024
1 parent f2c59dd commit 4d2739d
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions apis/apps/v1beta1/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ limitations under the License.

package v1beta1

import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
import (
"slices"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

func (in *ConfigConstraintSpec) NeedDynamicReloadAction() bool {
if in.MergeReloadAndRestart != nil {
Expand All @@ -40,19 +44,29 @@ func (in *ConfigConstraintSpec) GetToolsSetup() *ToolsSetup {
}

func (in *ConfigConstraintSpec) GetScriptConfigs() []ScriptConfig {
uniqueSlice := func(items []ScriptConfig) []ScriptConfig {
var uniqItems []ScriptConfig
for _, item := range items {
if !slices.Contains(uniqItems, item) {
uniqItems = append(uniqItems, item)
}
}
return uniqItems
}

scriptConfigs := make([]ScriptConfig, 0)
for _, action := range in.DownwardAPIChangeTriggeredActions {
if action.ScriptConfig != nil {
scriptConfigs = append(scriptConfigs, *action.ScriptConfig)
}
}
if in.ReloadAction == nil {
return scriptConfigs
return uniqueSlice(scriptConfigs)
}
if in.ReloadAction.ShellTrigger != nil && in.ReloadAction.ShellTrigger.ScriptConfig != nil {
scriptConfigs = append(scriptConfigs, *in.ReloadAction.ShellTrigger.ScriptConfig)
}
return scriptConfigs
return uniqueSlice(scriptConfigs)
}

func (in *ConfigConstraintSpec) ShellTrigger() bool {
Expand Down

0 comments on commit 4d2739d

Please sign in to comment.