Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,21 @@ linters:
revive:
rules:
- name: comment-spacings
issues:
exclude-rules:
- path: 'api/.*'
linters:
- lll
exclusions:
generated: lax
rules:
- linters:
- lll
path: api/*
path: api/.*
- linters:
- dupl
- lll
path: internal/*
path: internal/.*
paths:
- third_party$
- builtin$
Expand Down
8 changes: 7 additions & 1 deletion helm/kmcp/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,16 @@ spec:
name: health
protocol: TCP
{{- end }}
{{- if .Values.controller.env }}
{{- if or .Values.controller.env (and .Values.transportAdapter .Values.transportAdapter.registry) }}
env:
{{- if and .Values.transportAdapter .Values.transportAdapter.registry }}
- name: TRANSPORT_ADAPTER_REGISTRY
value: {{ .Values.transportAdapter.registry | quote }}
{{- end }}
{{- if .Values.controller.env }}
{{- toYaml .Values.controller.env | nindent 8 }}
{{- end }}
{{- end }}
securityContext:
{{- toYaml .Values.securityContext | nindent 10 }}
{{- if .Values.controller.healthProbe.bindAddress }}
Expand Down
5 changes: 5 additions & 0 deletions helm/kmcp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,8 @@ service:
type: ClusterIP
port: 8443
targetPort: 8443

# Transport adapter configuration
transportAdapter:
# Override the default registry for the transport adapter image
registry: "ghcr.io/agentgateway"
21 changes: 15 additions & 6 deletions pkg/controller/transportadapter/transportadapter_translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ import (
)

const (
transportAdapterRepository = "ghcr.io/agentgateway/agentgateway"
defaultTransportAdapterVersion = "0.9.0"
kgatewayMcpAppProtocol = "kgateway.dev/mcp"
defaultTransportAdapterRegistry = "ghcr.io/agentgateway"
transportAdapterImageName = "agentgateway"
defaultTransportAdapterVersion = "0.9.0"
kgatewayMcpAppProtocol = "kgateway.dev/mcp"
)

// versionRegex validates that version strings contain only allowed characters
Expand Down Expand Up @@ -672,17 +673,25 @@ func validateVersion(version string) error {
// getTransportAdapterImage returns the transport adapter container image,
// using the environment variable if provided and valid, otherwise using the default
func getTransportAdapterImage() string {
transportAdapterRegistry := os.Getenv("TRANSPORT_ADAPTER_REGISTRY")
if transportAdapterRegistry == "" {
transportAdapterRegistry = defaultTransportAdapterRegistry
}

transportAdapterVersion := os.Getenv("TRANSPORT_ADAPTER_VERSION")
if transportAdapterVersion == "" {
return fmt.Sprintf("%s:%s-musl", transportAdapterRepository, defaultTransportAdapterVersion)
return fmt.Sprintf("%s/%s:%s-musl",
transportAdapterRegistry, transportAdapterImageName, defaultTransportAdapterVersion)
}

if err := validateVersion(transportAdapterVersion); err != nil {
klog.Warningf("Invalid TRANSPORT_ADAPTER_VERSION: %v, fallback to %s", err, defaultTransportAdapterVersion)
return fmt.Sprintf("%s:%s-musl", transportAdapterRepository, defaultTransportAdapterVersion)
return fmt.Sprintf("%s/%s:%s-musl",
transportAdapterRegistry, transportAdapterImageName, defaultTransportAdapterVersion)
}

return fmt.Sprintf("%s:%s-musl", transportAdapterRepository, transportAdapterVersion)
return fmt.Sprintf("%s/%s:%s-musl",
transportAdapterRegistry, transportAdapterImageName, transportAdapterVersion)
}

func makePtr[T any](v T) *T {
Expand Down