Skip to content

CONSOLE-5271: Address docs review feedback from PR #16551 #16655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
perdasilva wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −10
Open

CONSOLE-5271: Address docs review feedback from PR #16551 #16655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions frontend/packages/operator-lifecycle-manager/locales/en/olm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 6 additions & 4 deletions frontend/packages/operator-lifecycle-manager/src/components/operator-lifecycle-status.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,13 @@ const LifecycleDatesFooter: FC = () => {
<>
<hr className="pf-v6-u-mb-sm pf-v6-u-mt-0" />
<span className="pf-v6-u-color-200">
{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.',
)}
</span>
<div className="pf-v6-u-mt-sm">
<ExternalLink href="https://access.redhat.com/support/policy/updates/openshift_operators/lifecycle">
{t('OpenShift Operator life cycle')}
{t('OpenShift Operator lifecycle')}
</ExternalLink>
</div>
{clusterMinor && (
Expand All @@ -198,13 +200,13 @@ const LifecycleDatesFooter: FC = () => {
'',
)}`}
>
{t('OpenShift life cycle ({{version}})', { version: clusterMinor })}
{t('OpenShift lifecycle ({{version}})', { version: clusterMinor })}
</ExternalLink>
</div>
)}
<div>
<ExternalLink href="https://access.redhat.com/product-life-cycles">
{t('Red Hat product life cycles')}
{t('Red Hat product lifecycles')}
</ExternalLink>
</div>
</>
Expand Down
4 changes: 2 additions & 2 deletions pkg/olm/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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."})
Expand Down