diff --git a/frontend/packages/operator-lifecycle-manager/locales/en/olm.json b/frontend/packages/operator-lifecycle-manager/locales/en/olm.json index 1d4c314f726..fde3a61fcc7 100644 --- a/frontend/packages/operator-lifecycle-manager/locales/en/olm.json +++ b/frontend/packages/operator-lifecycle-manager/locales/en/olm.json @@ -384,10 +384,10 @@ "Compatible": "Compatible", "Incompatible": "Incompatible", "No data available": "No data available", - "May not reflect your actual SKU. Check your actual SKU for extended support.": "May not reflect your actual SKU. Check your actual SKU for extended support.", - "OpenShift Operator life cycle": "OpenShift Operator life cycle", - "OpenShift life cycle ({{version}})": "OpenShift life cycle ({{version}})", - "Red Hat product life cycles": "Red Hat product life cycles", + "This might not reflect your actual SKU. Check your subscription for extended support options.": "This might not reflect your actual SKU. Check your subscription for extended support options.", + "OpenShift Operator lifecycle": "OpenShift Operator lifecycle", + "OpenShift lifecycle ({{version}})": "OpenShift lifecycle ({{version}})", + "Red Hat product lifecycles": "Red Hat product lifecycles", "Lifecycle dates": "Lifecycle dates", "Self-support": "Self-support", "No PackageManifests Found": "No PackageManifests Found", diff --git a/frontend/packages/operator-lifecycle-manager/src/components/operator-lifecycle-status.tsx b/frontend/packages/operator-lifecycle-manager/src/components/operator-lifecycle-status.tsx index 62ff95e8704..e5d7bae8354 100644 --- a/frontend/packages/operator-lifecycle-manager/src/components/operator-lifecycle-status.tsx +++ b/frontend/packages/operator-lifecycle-manager/src/components/operator-lifecycle-status.tsx @@ -183,11 +183,13 @@ const LifecycleDatesFooter: FC = () => { <>
- {t('May not reflect your actual SKU. Check your actual SKU for extended support.')} + {t( + 'This might not reflect your actual SKU. Check your subscription for extended support options.', + )}
- {t('OpenShift Operator life cycle')} + {t('OpenShift Operator lifecycle')}
{clusterMinor && ( @@ -198,13 +200,13 @@ const LifecycleDatesFooter: FC = () => { '', )}`} > - {t('OpenShift life cycle ({{version}})', { version: clusterMinor })} + {t('OpenShift lifecycle ({{version}})', { version: clusterMinor })} )}
- {t('Red Hat product life cycles')} + {t('Red Hat product lifecycles')}
diff --git a/pkg/olm/lifecycle.go b/pkg/olm/lifecycle.go index 296d03947a3..6eff023a3b1 100644 --- a/pkg/olm/lifecycle.go +++ b/pkg/olm/lifecycle.go @@ -63,7 +63,7 @@ func (o *OLMHandler) lifecycleHandler(w http.ResponseWriter, r *http.Request) { conn, err := grpc.NewClient(target, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { klog.Errorf("[lifecycle] Failed to create gRPC client for %s: %v", target, err) - serverutils.SendResponse(w, http.StatusInternalServerError, serverutils.ApiError{Err: "Failed to connect to the catalog source."}) + serverutils.SendResponse(w, http.StatusInternalServerError, serverutils.ApiError{Err: "Could not connect to the catalog source."}) return } defer conn.Close() @@ -127,7 +127,7 @@ func handleGRPCError(w http.ResponseWriter, catalogName, packageName string, err switch st.Code() { case codes.Unimplemented: klog.Infof("[lifecycle] ExperimentalListPackageCustomSchemas not supported by catalog %s", catalogName) - serverutils.SendResponse(w, http.StatusServiceUnavailable, serverutils.ApiError{Err: "Lifecycle metadata is not available for this catalog."}) + serverutils.SendResponse(w, http.StatusServiceUnavailable, serverutils.ApiError{Err: "The lifecycle metadata is unavailable for this catalog."}) case codes.Unavailable: klog.Infof("[lifecycle] CatalogSource %s gRPC unavailable: %v", catalogName, st.Message()) serverutils.SendResponse(w, http.StatusServiceUnavailable, serverutils.ApiError{Err: "The catalog source is unavailable. Try again later."})