Skip to content

Commit ffab8a6

Browse files
committed
fixup: Stop setting plugin dir for pods
1 parent 8ad6c7f commit ffab8a6

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

tests/fixture/tmpnet/defaults.go

+2-6
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,13 @@ func DefaultProcessFlags() FlagsMap {
6363
}
6464

6565
// Flags appropriate for a node running as a local process
66-
func DefaultKubeFlags(includePluginDir bool) FlagsMap {
67-
flags := FlagsMap{
66+
func DefaultKubeFlags() FlagsMap {
67+
return FlagsMap{
6868
config.HTTPHostKey: "0.0.0.0", // Need to bind to pod IP to ensure kubelet can access the http port for readiness check
6969
config.LogDisplayLevelKey: logging.Info.String(),
7070
// TODO(marun) Revert
7171
config.LogLevelKey: logging.Info.String(), // Assume collection of stdout logs
7272
}
73-
if includePluginDir {
74-
flags[config.PluginDirKey] = "/avalanchego/build/plugins"
75-
}
76-
return flags
7773
}
7874

7975
// Flags required by e2e testing

tests/fixture/tmpnet/node_pod.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,7 @@ func (p *NodePod) readState(ctx context.Context) error {
108108
}
109109

110110
func (p *NodePod) SetDefaultFlags() {
111-
// Only include the plugin dir if there are subnets to track to ensure an immutable path can be used
112-
// TODO(marun) Revisit this comment
113-
trackSubnets, err := p.node.Flags.GetStringVal(config.TrackSubnetsKey)
114-
includePluginDir := err == nil && len(trackSubnets) > 0
115-
p.node.Flags.SetDefaults(DefaultKubeFlags(includePluginDir))
111+
p.node.Flags.SetDefaults(DefaultKubeFlags())
116112
}
117113

118114
// TODO(marun) Maybe better with a timestamp used as input to generateName and include uuid and node id as labels?

0 commit comments

Comments
 (0)