Skip to content

Commit f283029

Browse files
Patryk-StefanskiPatryk-Stefanski
authored
Merge pull request #1070 from Patryk-Stefanski/merge-main-into-release-0.7.0-v2
Merge main into release-0.7.0 rc3
2 parents 3ea024c + d6754b1 commit f283029

19 files changed

Lines changed: 503 additions & 24 deletions

‎.github/workflows/test-images.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ jobs:
7777
context: tests/servers/tls-server
7878
dockerfile: Dockerfile
7979
image-name: test-tls-server
80+
- server: user-specific-server
81+
context: .
82+
dockerfile: tests/servers/user-specific-server/Dockerfile
83+
image-name: test-user-specific-server
8084

8185
steps:
8286
- name: Check out code

‎Makefile‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,14 @@ deploy-redis: ## deploy redis to mcp-system namespace
243243
kubectl rollout status deployment/redis -n $(MCP_GATEWAY_NAMESPACE) --timeout=60s
244244

245245
.PHONY: configure-redis
246-
configure-redis: deploy-redis ## deploy redis and patch deployment with redis connection
247-
kubectl patch deployment $(BROKER_ROUTER_NAME) -n $(MCP_GATEWAY_NAMESPACE) --patch-file config/mcp-gateway/overlays/mcp-system/deployment-controller-redis-patch.yaml
246+
configure-redis: deploy-redis ## deploy redis and configure MCPGatewayExtension session store
247+
kubectl create secret generic redis-session-store \
248+
--from-literal=CACHE_CONNECTION_STRING=redis://redis.$(MCP_GATEWAY_NAMESPACE).svc.cluster.local:6379 \
249+
-n $(MCP_GATEWAY_NAMESPACE) --dry-run=client -o yaml | kubectl apply -f -
250+
kubectl label secret redis-session-store mcp.kuadrant.io/secret=true -n $(MCP_GATEWAY_NAMESPACE) --overwrite
251+
kubectl patch mcpgatewayextension mcp-gateway-extension -n $(MCP_GATEWAY_NAMESPACE) --type=merge \
252+
-p '{"spec":{"sessionStore":{"secretName":"redis-session-store"}}}'
253+
kubectl wait --for=condition=Ready mcpgatewayextension/mcp-gateway-extension -n $(MCP_GATEWAY_NAMESPACE) --timeout=$(WAIT_TIME)
248254

249255
# Deploy only the controller
250256
deploy-controller: install-crd ## Deploy only the controller

‎bundle/manifests/mcp-gateway.clusterserviceversion.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ metadata:
55
alm-examples: "[\n {\n \"apiVersion\": \"mcp.kuadrant.io/v1alpha1\",\n \"kind\": \"MCPGatewayExtension\",\n \"metadata\": {\n \"name\": \"mcp-gateway-extension\",\n \"namespace\": \"mcp-system\"\n },\n \"spec\": {\n \"targetRef\": {\n \"group\": \"gateway.networking.k8s.io\",\n \"kind\": \"Gateway\",\n \"name\": \"mcp-gateway\",\n \"namespace\": \"gateway-system\",\n \"sectionName\": \"mcp\"\n }\n }\n },\n {\n \"apiVersion\": \"mcp.kuadrant.io/v1alpha1\",\n \"kind\": \"MCPServerRegistration\",\n \"metadata\": {\n \"name\": \"example-server\",\n \"namespace\": \"mcp-test\"\n },\n \"spec\": {\n \"prefix\": \"example_\",\n \"targetRef\": {\n \"group\": \"gateway.networking.k8s.io\",\n \"kind\": \"HTTPRoute\",\n \"name\": \"example-route\"\n }\n }\n },\n {\n \"apiVersion\": \"mcp.kuadrant.io/v1alpha1\",\n \"kind\": \"MCPVirtualServer\",\n \"metadata\": {\n \"name\": \"example-vs\",\n \"namespace\": \"default\"\n },\n \"spec\": {\n \"description\": \"example virtual server\",\n \"tools\": [\n \"server1_tool1\",\n \"server2_tool2\"\n ]\n }\n }\n]"
66
capabilities: Basic Install
77
categories: Integration & Delivery
8-
containerImage: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc1
9-
createdAt: "2026-05-29T09:20:43Z"
8+
containerImage: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc3
9+
createdAt: "2026-06-02T08:58:40Z"
1010
description: An Envoy-based gateway for Model Context Protocol (MCP) servers
1111
operators.operatorframework.io/builder: operator-sdk-v1.38.0
1212
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
1313
repository: https://github.com/Kuadrant/mcp-gateway
1414
support: kuadrant
15-
name: mcp-gateway.v0.7.0-rc1
15+
name: mcp-gateway.v0.7.0-rc3
1616
namespace: placeholder
1717
spec:
1818
apiservicedefinitions: {}
@@ -181,8 +181,8 @@ spec:
181181
- --log-level=0
182182
env:
183183
- name: RELATED_IMAGE_ROUTER_BROKER
184-
value: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc1
185-
image: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc1
184+
value: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc3
185+
image: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc3
186186
imagePullPolicy: IfNotPresent
187187
livenessProbe:
188188
httpGet:
@@ -242,6 +242,6 @@ spec:
242242
name: Kuadrant
243243
url: https://kuadrant.io
244244
relatedImages:
245-
- image: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc1
245+
- image: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc3
246246
name: router-broker
247-
version: 0.7.0-rc1
247+
version: 0.7.0-rc3

‎charts/sample_local_helm_setup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ set -e
77

88
# Allow specifying a different GitHub org/user and version via environment variables
99
GITHUB_ORG=${MCP_GATEWAY_ORG:-Kuadrant}
10-
VERSION=${MCP_GATEWAY_VERSION:-0.7.0-rc1}
10+
VERSION=${MCP_GATEWAY_VERSION:-0.7.0-rc3}
1111
GIT_REF="v${VERSION}"
1212
USE_LOCAL_CHART=${USE_LOCAL_CHART:-false}
1313
echo "Using GitHub org: $GITHUB_ORG"

‎config/deploy/olm/catalogsource.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: mcp-gateway-catalog
55
spec:
66
sourceType: grpc
7-
image: ghcr.io/kuadrant/mcp-controller-catalog:v0.7.0-rc1
7+
image: ghcr.io/kuadrant/mcp-controller-catalog:v0.7.0-rc3
88
displayName: MCP Gateway
99
grpcPodConfig:
1010
securityContextConfig: restricted

‎config/manifests/bases/mcp-gateway.clusterserviceversion.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ metadata:
5555
]
5656
capabilities: Basic Install
5757
categories: Integration & Delivery
58-
containerImage: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc1
58+
containerImage: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc3
5959
description: An Envoy-based gateway for Model Context Protocol (MCP) servers
6060
repository: https://github.com/Kuadrant/mcp-gateway
6161
support: kuadrant
62-
name: mcp-gateway.v0.7.0-rc1
62+
name: mcp-gateway.v0.7.0-rc3
6363
namespace: placeholder
6464
spec:
6565
customresourcedefinitions:
@@ -119,4 +119,4 @@ spec:
119119
provider:
120120
name: Kuadrant
121121
url: https://kuadrant.io
122-
version: 0.7.0-rc1
122+
version: 0.7.0-rc3

‎config/mcp-gateway/components/controller/deployment-controller.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ spec:
2020
serviceAccountName: mcp-controller
2121
containers:
2222
- name: mcp-controller
23-
image: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc1
23+
image: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc3
2424
imagePullPolicy: IfNotPresent
2525
command:
2626
- ./mcp_controller
2727
- --log-level=0 # info level
2828
env:
2929
- name: RELATED_IMAGE_ROUTER_BROKER
30-
value: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc1
30+
value: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc3
3131
ports:
3232
- name: health
3333
containerPort: 8081

‎config/mcp-system/deployment-broker.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
secretName: mcp-gateway-config
2626
containers:
2727
- name: mcp-broker-router
28-
image: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc1
28+
image: ghcr.io/kuadrant/mcp-gateway:v0.7.0-rc3
2929
imagePullPolicy: IfNotPresent
3030
command:
3131
- ./mcp_gateway

‎config/mcp-system/deployment-controller.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
serviceAccountName: mcp-controller
2222
containers:
2323
- name: mcp-controller
24-
image: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc1
24+
image: ghcr.io/kuadrant/mcp-controller:v0.7.0-rc3
2525
imagePullPolicy: IfNotPresent
2626
command:
2727
- ./mcp_controller

‎config/openshift/deploy_openshift.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
MCP_GATEWAY_VERSION="${MCP_GATEWAY_VERSION:-0.7.0-rc1}"
5+
MCP_GATEWAY_VERSION="${MCP_GATEWAY_VERSION:-0.7.0-rc3}"
66
MCP_GATEWAY_HOST="${MCP_GATEWAY_HOST:-mcp.apps.$(oc get dns cluster -o jsonpath='{.spec.baseDomain}')}"
77
MCP_GATEWAY_NAMESPACE="${MCP_GATEWAY_NAMESPACE:-mcp-system}"
88
GATEWAY_NAMESPACE="${GATEWAY_NAMESPACE:-gateway-system}"

0 commit comments

Comments
 (0)