Skip to content

Commit ad70ac3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #920 from syedriko/syedriko-openshift-mcp-server-image
Update the openshift-mcp-server image references
2 parents afe7971 + 554ed34 commit ad70ac3

File tree

14 files changed

+15
-15
lines changed

14 files changed

+15
-15
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ build: manifests generate fmt vet ## Build manager binary.
210210
LIGHTSPEED_SERVICE_IMG ?= quay.io/openshift-lightspeed/lightspeed-service-api:latest
211211
LIGHTSPEED_SERVICE_POSTGRES_IMG ?= registry.redhat.io/rhel9/postgresql-16@sha256:6d2cab6cb6366b26fcf4591fe22aa5e8212a3836c34c896bb65977a8e50d658b
212212
CONSOLE_PLUGIN_IMG ?= quay.io/openshift-lightspeed/lightspeed-console-plugin:latest
213-
MCP_SERVER_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d
213+
MCP_SERVER_IMG ?= quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43
214214
.PHONY: run
215215
run: manifests generate fmt vet ## Run a controller from your host.
216216
#TODO: Update DB

‎bundle.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG CSV_FILE=bundle/manifests/lightspeed-operator.clusterserviceversion.yaml
44
ARG OPERATOR_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-operator:latest
55
ARG SERVICE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-service-api:latest
66
ARG CONSOLE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-console-plugin:latest
7-
ARG MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d
7+
ARG MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43
88

99
RUN microdnf install -y jq
1010

‎bundle/manifests/lightspeed-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,4 +707,4 @@ spec:
707707
- name: lightspeed-operator
708708
image: quay.io/openshift-lightspeed/lightspeed-operator:latest
709709
- name: mcp-server
710-
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d
710+
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43

‎hack/template_bundle.Containerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG CSV_FILE=bundle/manifests/lightspeed-operator.clusterserviceversion.yaml
44
ARG OPERATOR_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-operator:latest
55
ARG SERVICE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-service-api:latest
66
ARG CONSOLE_IMAGE_ORIGINAL=quay.io/openshift-lightspeed/lightspeed-console-plugin:latest
7-
ARG MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d
7+
ARG MCP_SERVER_IMAGE_ORIGINAL=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43
88

99
RUN microdnf install -y jq
1010

‎hack/update_bundle.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ else
132132
},
133133
{
134134
"name": "mcp-server",
135-
"image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d"
135+
"image": "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43"
136136
}
137137
]
138138
EOF
@@ -159,7 +159,7 @@ ${OPERATOR_SDK} bundle validate ./bundle
159159
# set service, console, and mcp-server images for the operator
160160
${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/openshift-lightspeed/lightspeed-service-api:latest\", ${SERVICE_IMAGE}))" -i ${CSV_FILE}
161161
${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/openshift-lightspeed/lightspeed-console-plugin:latest\", ${CONSOLE_IMAGE}))" -i ${CSV_FILE}
162-
${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d\", ${MCP_SERVER_IMAGE}))" -i ${CSV_FILE}
162+
${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].args[] |= sub(\"quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43\", ${MCP_SERVER_IMAGE}))" -i ${CSV_FILE}
163163
${YQ} "(.spec.install.spec.deployments[].spec.template.spec.containers[].image |= sub(\"quay.io/openshift-lightspeed/lightspeed-operator:latest\", ${OPERATOR_IMAGE}))" -i ${CSV_FILE}
164164
# set related images to the CSV file
165165
${YQ} eval -i '.spec.relatedImages='"${RELATED_IMAGES}" ${CSV_FILE}

‎internal/controller/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ ssl_ca_file = '/etc/certs/cm-olspostgresca/service-ca.crt'
254254
// MetricsReaderServiceAccountName is the name of the service account for the metrics reader
255255
MetricsReaderServiceAccountName = "lightspeed-operator-metrics-reader"
256256
// MCP server image
257-
MCPServerImageDefault = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d"
257+
MCPServerImageDefault = "quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43"
258258
// MCP server URL
259259
MCPServerURL = "http://localhost:%d/mcp"
260260
// MCP server port

‎internal/controller/ols_app_server_assets_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1182,7 +1182,7 @@ var _ = Describe("App server assets", func() {
11821182
Expect(mcpContainer.Name).To(Equal("openshift-mcp"))
11831183
Expect(mcpContainer.Image).To(Equal(rOptions.MCPServerImage))
11841184
Expect(mcpContainer.ImagePullPolicy).To(Equal(corev1.PullIfNotPresent))
1185-
Expect(mcpContainer.Command).To(Equal([]string{"/app/kubernetes-mcp-server", "--read-only", "--port", fmt.Sprintf("%d", MCPServerPort)}))
1185+
Expect(mcpContainer.Command).To(Equal([]string{"/openshift-mcp-server", "--read-only", "--port", fmt.Sprintf("%d", MCPServerPort)}))
11861186
Expect(mcpContainer.SecurityContext).To(Equal(&corev1.SecurityContext{
11871187
AllowPrivilegeEscalation: &[]bool{false}[0],
11881188
ReadOnlyRootFilesystem: &[]bool{true}[0],

‎internal/controller/ols_app_server_deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func (r *OLSConfigReconciler) generateOLSDeployment(cr *olsv1alpha1.OLSConfig) (
389389
ReadOnlyRootFilesystem: &[]bool{true}[0],
390390
},
391391
VolumeMounts: volumeMounts,
392-
Command: []string{"/app/kubernetes-mcp-server", "--read-only", "--port", fmt.Sprintf("%d", MCPServerPort)},
392+
Command: []string{"/openshift-mcp-server", "--read-only", "--port", fmt.Sprintf("%d", MCPServerPort)},
393393
Resources: *mcp_server_resources,
394394
}
395395
deployment.Spec.Template.Spec.Containers = append(deployment.Spec.Template.Spec.Containers, mcpSidecarContainer)

‎lightspeed-catalog-4.15/index.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ relatedImages:
6262
- name: lightspeed-operator-bundle
6363
image: registry.redhat.io/openshift-lightspeed/lightspeed-operator-bundle@sha256:a556e86058237d8afab41a4dc320c487645d8a1824ae68a0c2adb32ae6f72d7f
6464
- name: mcp-server
65-
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d
65+
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43
6666
schema: olm.bundle
6767
---
6868
schema: olm.channel

‎lightspeed-catalog-4.16/index.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ relatedImages:
6262
- name: lightspeed-operator-bundle
6363
image: registry.redhat.io/openshift-lightspeed/lightspeed-operator-bundle@sha256:a556e86058237d8afab41a4dc320c487645d8a1824ae68a0c2adb32ae6f72d7f
6464
- name: mcp-server
65-
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/kubernetes-mcp-server-ols@sha256:a453ce901d1cdebcdbf2c91ef04ef38870e02a9abfedc0f6ede9224bd3e7e87d
65+
image: quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/openshift-mcp-server@sha256:3a035744b772104c6c592acf8a813daced19362667ed6dab73a00d17eb9c3a43
6666
schema: olm.bundle
6767
---
6868
schema: olm.channel

0 commit comments

Comments
 (0)