Skip to content

Commit 65f4bd6

Browse files
ardagucluardaguclu
committed
Define flags in configuration file
1 parent cd1cb1a commit 65f4bd6

File tree

5 files changed

+159
-25
lines changed

5 files changed

+159
-25
lines changed

‎pkg/config/config.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ import (
88

99
type StaticConfig struct {
1010
DeniedResources []GroupVersionKind `toml:"denied_resources"`
11+
12+
LogLevel int `toml:"log_level,omitempty"`
13+
SSEPort int `toml:"sse_port,omitempty"`
14+
HTTPPort int `toml:"http_port,omitempty"`
15+
SSEBaseURL string `toml:"sse_base_url,omitempty"`
16+
KubeConfig string `toml:"kubeconfig,omitempty"`
17+
ListOutput string `toml:"list_output,omitempty"`
18+
ReadOnly bool `toml:"read_only,omitempty"`
19+
DisableDestructive bool `toml:"disable_destructive,omitempty"`
1120
}
1221

1322
type GroupVersionKind struct {

‎pkg/config/config_test.go‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ func TestReadConfig(t *testing.T) {
1111

1212
t.Run("ValidConfigFileWithDeniedResources", func(t *testing.T) {
1313
validConfigContent := `
14+
log_level = 1
15+
sse_port = 9999
16+
kubeconfig = "test"
17+
list_output = "yaml"
18+
read_only = true
19+
disable_destructive = false
20+
1421
[[denied_resources]]
1522
group = "apps"
1623
version = "v1"
@@ -44,5 +51,30 @@ version = "v1"
4451
config.DeniedResources[0].Kind != "Deployment" {
4552
t.Errorf("Unexpected denied resources: %v", config.DeniedResources[0])
4653
}
54+
55+
if config.LogLevel != 1 {
56+
t.Fatalf("Unexpected log level: %v", config.LogLevel)
57+
}
58+
if config.SSEPort != 9999 {
59+
t.Fatalf("Unexpected sse_port value: %v", config.SSEPort)
60+
}
61+
if config.SSEBaseURL != "" {
62+
t.Fatalf("Unexpected sse_base_url value: %v", config.SSEBaseURL)
63+
}
64+
if config.HTTPPort != 0 {
65+
t.Fatalf("Unexpected http_port value: %v", config.HTTPPort)
66+
}
67+
if config.KubeConfig != "test" {
68+
t.Fatalf("Unexpected kubeconfig value: %v", config.KubeConfig)
69+
}
70+
if config.ListOutput != "yaml" {
71+
t.Fatalf("Unexpected list_output value: %v", config.ListOutput)
72+
}
73+
if !config.ReadOnly {
74+
t.Fatalf("Unexpected read-only mode: %v", config.ReadOnly)
75+
}
76+
if config.DisableDestructive {
77+
t.Fatalf("Unexpected disable destructive: %v", config.DisableDestructive)
78+
}
4779
})
4880
}

‎pkg/kubernetes-mcp-server/cmd/root.go‎

Lines changed: 55 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ type MCPServerOptions struct {
6262

6363
func NewMCPServerOptions(streams genericiooptions.IOStreams) *MCPServerOptions {
6464
return &MCPServerOptions{
65-
IOStreams: streams,
66-
Profile: "full",
67-
ListOutput: "table",
65+
IOStreams: streams,
66+
Profile: "full",
67+
ListOutput: "table",
68+
StaticConfig: &config.StaticConfig{},
6869
}
6970
}
7071

@@ -76,7 +77,7 @@ func NewMCPServer(streams genericiooptions.IOStreams) *cobra.Command {
7677
Long: long,
7778
Example: examples,
7879
RunE: func(c *cobra.Command, args []string) error {
79-
if err := o.Complete(); err != nil {
80+
if err := o.Complete(c); err != nil {
8081
return err
8182
}
8283
if err := o.Validate(); err != nil {
@@ -98,16 +99,14 @@ func NewMCPServer(streams genericiooptions.IOStreams) *cobra.Command {
9899
cmd.Flags().StringVar(&o.SSEBaseUrl, "sse-base-url", o.SSEBaseUrl, "SSE public base URL to use when sending the endpoint message (e.g. https://example.com)")
99100
cmd.Flags().StringVar(&o.Kubeconfig, "kubeconfig", o.Kubeconfig, "Path to the kubeconfig file to use for authentication")
100101
cmd.Flags().StringVar(&o.Profile, "profile", o.Profile, "MCP profile to use (one of: "+strings.Join(mcp.ProfileNames, ", ")+")")
101-
cmd.Flags().StringVar(&o.ListOutput, "list-output", o.ListOutput, "Output format for resource list operations (one of: "+strings.Join(output.Names, ", ")+")")
102+
cmd.Flags().StringVar(&o.ListOutput, "list-output", o.ListOutput, "Output format for resource list operations (one of: "+strings.Join(output.Names, ", ")+"). Defaults to table.")
102103
cmd.Flags().BoolVar(&o.ReadOnly, "read-only", o.ReadOnly, "If true, only tools annotated with readOnlyHint=true are exposed")
103104
cmd.Flags().BoolVar(&o.DisableDestructive, "disable-destructive", o.DisableDestructive, "If true, tools annotated with destructiveHint=true are disabled")
104105

105106
return cmd
106107
}
107108

108-
func (m *MCPServerOptions) Complete() error {
109-
m.initializeLogging()
110-
109+
func (m *MCPServerOptions) Complete(cmd *cobra.Command) error {
111110
if m.ConfigPath != "" {
112111
cnf, err := config.ReadConfig(m.ConfigPath)
113112
if err != nil {
@@ -116,16 +115,47 @@ func (m *MCPServerOptions) Complete() error {
116115
m.StaticConfig = cnf
117116
}
118117

118+
m.loadFlags(cmd)
119+
120+
m.initializeLogging()
121+
119122
return nil
120123
}
121124

125+
func (m *MCPServerOptions) loadFlags(cmd *cobra.Command) {
126+
if cmd.Flag("log-level").Changed {
127+
m.StaticConfig.LogLevel = m.LogLevel
128+
}
129+
if cmd.Flag("sse-port").Changed {
130+
m.StaticConfig.SSEPort = m.SSEPort
131+
}
132+
if cmd.Flag("http-port").Changed {
133+
m.StaticConfig.HTTPPort = m.HttpPort
134+
}
135+
if cmd.Flag("sse-base-url").Changed {
136+
m.StaticConfig.SSEBaseURL = m.SSEBaseUrl
137+
}
138+
if cmd.Flag("kubeconfig").Changed {
139+
m.StaticConfig.KubeConfig = m.Kubeconfig
140+
}
141+
if cmd.Flag("list-output").Changed || m.StaticConfig.ListOutput == "" {
142+
m.StaticConfig.ListOutput = m.ListOutput
143+
}
144+
if cmd.Flag("read-only").Changed {
145+
m.StaticConfig.ReadOnly = m.ReadOnly
146+
}
147+
if cmd.Flag("disable-destructive").Changed {
148+
m.StaticConfig.DisableDestructive = m.DisableDestructive
149+
}
150+
}
151+
122152
func (m *MCPServerOptions) initializeLogging() {
123153
flagSet := flag.NewFlagSet("klog", flag.ContinueOnError)
124154
klog.InitFlags(flagSet)
125155
loggerOptions := []textlogger.ConfigOption{textlogger.Output(m.Out)}
126-
if m.LogLevel >= 0 {
127-
loggerOptions = append(loggerOptions, textlogger.Verbosity(m.LogLevel))
128-
_ = flagSet.Parse([]string{"--v", strconv.Itoa(m.LogLevel)})
156+
if m.StaticConfig.LogLevel >= 0 {
157+
loggerOptions = append(loggerOptions, textlogger.Verbosity(m.StaticConfig.LogLevel))
158+
_ = flagSet.Parse([]string{"--v", strconv.Itoa(m.StaticConfig.LogLevel)})
129159
}
130160
logger := textlogger.NewLogger(textlogger.NewConfig(loggerOptions...))
131161
klog.SetLoggerWithOptions(logger)
@@ -140,16 +170,16 @@ func (m *MCPServerOptions) Run() error {
140170
if profile == nil {
141171
return fmt.Errorf("Invalid profile name: %s, valid names are: %s\n", m.Profile, strings.Join(mcp.ProfileNames, ", "))
142172
}
143-
listOutput := output.FromString(m.ListOutput)
173+
listOutput := output.FromString(m.StaticConfig.ListOutput)
144174
if listOutput == nil {
145-
return fmt.Errorf("Invalid output name: %s, valid names are: %s\n", m.ListOutput, strings.Join(output.Names, ", "))
175+
return fmt.Errorf("Invalid output name: %s, valid names are: %s\n", m.StaticConfig.ListOutput, strings.Join(output.Names, ", "))
146176
}
147177
klog.V(1).Info("Starting kubernetes-mcp-server")
148178
klog.V(1).Infof(" - Config: %s", m.ConfigPath)
149179
klog.V(1).Infof(" - Profile: %s", profile.GetName())
150180
klog.V(1).Infof(" - ListOutput: %s", listOutput.GetName())
151-
klog.V(1).Infof(" - Read-only mode: %t", m.ReadOnly)
152-
klog.V(1).Infof(" - Disable destructive tools: %t", m.DisableDestructive)
181+
klog.V(1).Infof(" - Read-only mode: %t", m.StaticConfig.ReadOnly)
182+
klog.V(1).Infof(" - Disable destructive tools: %t", m.StaticConfig.DisableDestructive)
153183

154184
if m.Version {
155185
_, _ = fmt.Fprintf(m.Out, "%s\n", version.Version)
@@ -158,9 +188,9 @@ func (m *MCPServerOptions) Run() error {
158188
mcpServer, err := mcp.NewServer(mcp.Configuration{
159189
Profile: profile,
160190
ListOutput: listOutput,
161-
ReadOnly: m.ReadOnly,
162-
DisableDestructive: m.DisableDestructive,
163-
Kubeconfig: m.Kubeconfig,
191+
ReadOnly: m.StaticConfig.ReadOnly,
192+
DisableDestructive: m.StaticConfig.DisableDestructive,
193+
Kubeconfig: m.StaticConfig.KubeConfig,
164194
StaticConfig: m.StaticConfig,
165195
})
166196
if err != nil {
@@ -170,19 +200,19 @@ func (m *MCPServerOptions) Run() error {
170200

171201
ctx := context.Background()
172202

173-
if m.SSEPort > 0 {
174-
sseServer := mcpServer.ServeSse(m.SSEBaseUrl)
203+
if m.StaticConfig.SSEPort > 0 {
204+
sseServer := mcpServer.ServeSse(m.StaticConfig.SSEBaseURL)
175205
defer func() { _ = sseServer.Shutdown(ctx) }()
176-
klog.V(0).Infof("SSE server starting on port %d and path /sse", m.SSEPort)
177-
if err := sseServer.Start(fmt.Sprintf(":%d", m.SSEPort)); err != nil {
206+
klog.V(0).Infof("SSE server starting on port %d and path /sse", m.StaticConfig.SSEPort)
207+
if err := sseServer.Start(fmt.Sprintf(":%d", m.StaticConfig.SSEPort)); err != nil {
178208
return fmt.Errorf("failed to start SSE server: %w\n", err)
179209
}
180210
}
181211

182-
if m.HttpPort > 0 {
212+
if m.StaticConfig.HTTPPort > 0 {
183213
httpServer := mcpServer.ServeHTTP()
184-
klog.V(0).Infof("Streaming HTTP server starting on port %d and path /mcp", m.HttpPort)
185-
if err := httpServer.Start(fmt.Sprintf(":%d", m.HttpPort)); err != nil {
214+
klog.V(0).Infof("Streaming HTTP server starting on port %d and path /mcp", m.StaticConfig.HTTPPort)
215+
if err := httpServer.Start(fmt.Sprintf(":%d", m.StaticConfig.HTTPPort)); err != nil {
186216
return fmt.Errorf("failed to start streaming HTTP server: %w\n", err)
187217
}
188218
}

‎pkg/kubernetes-mcp-server/cmd/root_test.go‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,54 @@ func TestConfig(t *testing.T) {
6666
t.Fatalf("Expected config to be %s, got %s %v", expected, out.String(), err)
6767
}
6868
})
69+
t.Run("set with valid --config", func(t *testing.T) {
70+
ioStreams, out := testStream()
71+
rootCmd := NewMCPServer(ioStreams)
72+
_, file, _, _ := runtime.Caller(0)
73+
validConfigPath := filepath.Join(filepath.Dir(file), "testdata", "valid-config.toml")
74+
rootCmd.SetArgs([]string{"--version", "--config", validConfigPath})
75+
_ = rootCmd.Execute()
76+
expectedConfig := `(?m)\" - Config\:[^\"]+valid-config\.toml\"`
77+
if m, err := regexp.MatchString(expectedConfig, out.String()); !m || err != nil {
78+
t.Fatalf("Expected config to be %s, got %s %v", expectedConfig, out.String(), err)
79+
}
80+
expectedListOutput := `(?m)\" - ListOutput\: yaml"`
81+
if m, err := regexp.MatchString(expectedListOutput, out.String()); !m || err != nil {
82+
t.Fatalf("Expected config to be %s, got %s %v", expectedListOutput, out.String(), err)
83+
}
84+
expectedReadOnly := `(?m)\" - Read-only mode: true"`
85+
if m, err := regexp.MatchString(expectedReadOnly, out.String()); !m || err != nil {
86+
t.Fatalf("Expected config to be %s, got %s %v", expectedReadOnly, out.String(), err)
87+
}
88+
expectedDisableDestruction := `(?m)\" - Disable destructive tools: true"`
89+
if m, err := regexp.MatchString(expectedDisableDestruction, out.String()); !m || err != nil {
90+
t.Fatalf("Expected config to be %s, got %s %v", expectedDisableDestruction, out.String(), err)
91+
}
92+
})
93+
t.Run("set with valid --config, flags override", func(t *testing.T) {
94+
ioStreams, out := testStream()
95+
rootCmd := NewMCPServer(ioStreams)
96+
_, file, _, _ := runtime.Caller(0)
97+
validConfigPath := filepath.Join(filepath.Dir(file), "testdata", "valid-config.toml")
98+
rootCmd.SetArgs([]string{"--version", "--list-output=table", "--disable-destructive=false", "--read-only=false", "--config", validConfigPath})
99+
_ = rootCmd.Execute()
100+
expected := `(?m)\" - Config\:[^\"]+valid-config\.toml\"`
101+
if m, err := regexp.MatchString(expected, out.String()); !m || err != nil {
102+
t.Fatalf("Expected config to be %s, got %s %v", expected, out.String(), err)
103+
}
104+
expectedListOutput := `(?m)\" - ListOutput\: table"`
105+
if m, err := regexp.MatchString(expectedListOutput, out.String()); !m || err != nil {
106+
t.Fatalf("Expected config to be %s, got %s %v", expectedListOutput, out.String(), err)
107+
}
108+
expectedReadOnly := `(?m)\" - Read-only mode: false"`
109+
if m, err := regexp.MatchString(expectedReadOnly, out.String()); !m || err != nil {
110+
t.Fatalf("Expected config to be %s, got %s %v", expectedReadOnly, out.String(), err)
111+
}
112+
expectedDisableDestruction := `(?m)\" - Disable destructive tools: false"`
113+
if m, err := regexp.MatchString(expectedDisableDestruction, out.String()); !m || err != nil {
114+
t.Fatalf("Expected config to be %s, got %s %v", expectedDisableDestruction, out.String(), err)
115+
}
116+
})
69117
}
70118

71119
func TestProfile(t *testing.T) {

‎pkg/kubernetes-mcp-server/cmd/testdata/valid-config.toml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
log_level = 1
2+
sse_port = 9999
3+
kubeconfig = "test"
4+
list_output = "yaml"
5+
read_only = true
6+
disable_destructive = true
7+
8+
[[denied_resources]]
9+
group = "apps"
10+
version = "v1"
11+
kind = "Deployment"
12+
13+
[[denied_resources]]
14+
group = "rbac.authorization.k8s.io"
15+
version = "v1"

0 commit comments

Comments
 (0)