Crypto browserify removal attempt

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: tectonic-console-builder
   namespace: ci
-  tag: v28
+  tag: v29

.gitignore

@@ -1,13 +1,15 @@
 .env
 .idea
 .vscode
+!/vendor/**
 !.vscode/settings.json
 .DS_Store
 cypress-a11y-report.json
 /bin
 /gopath
 /Godeps/_workspace/src/github.com/openshift/console
 /frontend/.cache-loader
+/frontend/.puppeteer
 /frontend/.webpack-cycles
 /frontend/__coverage__
 /frontend/__chrome_browser__

Dockerfile

@@ -1,7 +1,7 @@
 ##################################################
 #
 # go backend build
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS gobuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS gobuilder
 RUN mkdir -p /go/src/github.com/openshift/console/
 ADD . /go/src/github.com/openshift/console/
 WORKDIR /go/src/github.com/openshift/console/
@@ -11,13 +11,13 @@ RUN ./build-backend.sh
 ##################################################
 #
 # nodejs frontend build
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.19 AS nodebuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.20 AS nodebuilder
 
 ADD . .
 
 USER 0
 
-ARG YARN_VERSION=v1.22.19
+ARG YARN_VERSION=v1.22.22
 
 # bootstrap yarn so we can install and run the other tools.
 RUN CACHED_YARN=./artifacts/yarn-${YARN_VERSION}.tar.gz; \
@@ -51,7 +51,7 @@ RUN container-entrypoint ./build-frontend.sh
 ##################################################
 #
 # actual base image for final product
-FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
 RUN mkdir -p /opt/bridge/bin
 COPY --from=gobuilder /go/src/github.com/openshift/console/bin/bridge /opt/bridge/bin
 COPY --from=nodebuilder /opt/app-root/src/frontend/public/dist /opt/bridge/static
@@ -72,4 +72,3 @@ LABEL \
         io.k8s.display-name="OpenShift Console" \
         vendor="Red Hat" \
         io.openshift.tags="openshift,console"
-

Dockerfile.builder

@@ -10,15 +10,12 @@
 
 FROM golang:1.22-bullseye
 
-### For golang testing stuff
-RUN go install github.com/jstemmer/go-junit-report@latest
-
 ### Install NodeJS and yarn
-ENV NODE_VERSION="v18.18.1"
-ENV YARN_VERSION="v1.22.10"
+ENV NODE_VERSION="v22.14.0"
+ENV YARN_VERSION="v1.22.22"
 
 # yarn needs a home writable by any user running the container
-ENV HOME /opt/home
+ENV HOME=/opt/home
 RUN mkdir -p ${HOME}
 RUN chmod 777 -R ${HOME}
 

Dockerfile.dev

@@ -1,12 +1,11 @@
 # Dockerfile to build console image from pre-built front end.
-
-FROM quay.io/coreos/tectonic-console-builder:v28 AS build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 AS build
 RUN mkdir -p /go/src/github.com/openshift/console/
 ADD . /go/src/github.com/openshift/console/
 WORKDIR /go/src/github.com/openshift/console/
 RUN ./build-backend.sh
 
-FROM openshift/origin-base
+FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
 COPY --from=build /go/src/github.com/openshift/console/bin/bridge /opt/bridge/bin/bridge
 COPY ./frontend/public/dist /opt/bridge/static
 COPY ./pkg/graphql/schema.graphql /pkg/graphql/schema.graphql

Dockerfile.plugins.demo

@@ -3,7 +3,7 @@
 # See dynamic-demo-plugin/README.md for details.
 
 # Stage 0: build the demo plugin
-FROM quay.io/coreos/tectonic-console-builder:v28 AS build
+FROM quay.io/coreos/tectonic-console-builder:v29 AS build
 
 RUN mkdir -p /src/console
 COPY . /src/console
@@ -16,7 +16,7 @@ RUN yarn install && \
     yarn build
 
 # Stage 1: build the target image
-FROM node:10
+FROM node:22
 
 COPY --from=build /src/console/dynamic-demo-plugin/dist /opt/console-plugin-demo/static
 COPY --from=build /src/console/dynamic-demo-plugin/node_modules /opt/console-plugin-demo/node_modules

Dockerfile.plugins.demo2

@@ -11,7 +11,7 @@
 # yarn build
 
 # Stage 1: build the target image
-FROM node:10
+FROM node:22
 
 COPY ./dynamic-demo-plugin/dist /opt/console-demo-plugin/static
 COPY ./dynamic-demo-plugin/node_modules /opt/console-demo-plugin/node_modules

INTERNATIONALIZATION.md

@@ -99,9 +99,9 @@ i18n.init({
 
 #### Translations
 
-OpenShift is currently translated into three languages: Chinese, Korean, and Japanese.
+OpenShift is currently translated into five languages: Chinese (Simplified), French, Japanese, Korean, and Spanish.
 
-Translation work is done by the Red Hat Globalization team. We send them updated files from the public and packages folders on a weekly or biweekly basis for the entire console and regularly import new translations.
+Translations in the Console are done in collaboration with the Red Hat Globalization team. The workflow involves exporting console strings from the public and packages folders to the Phrase TMS portal for translations. The completed translations are integrated into the console codebase when they are ready.
 
 #### Adding support for a new language
 

OWNERS

@@ -3,7 +3,6 @@ reviewers:
   - rhamilto
   - spadgett
 approvers:
-  - christoph-jerolimov
   - jhadvig
   - rhamilto
   - spadgett

README.md

@@ -15,7 +15,7 @@ The console is a more friendly `kubectl` in the form of a single page webapp. It
 
 ### Dependencies:
 
-1. [node.js](https://nodejs.org/) >= 18 & [yarn](https://yarnpkg.com/en/docs/install) >= 1.20
+1. [node.js](https://nodejs.org/) >= 22 & [yarn classic](https://classic.yarnpkg.com/en/docs/install) >= 1.20
 2. [go](https://golang.org/) >= 1.22+
 3. [oc](https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/) or [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) and an OpenShift or Kubernetes cluster
 4. [jq](https://stedolan.github.io/jq/download/) (for `contrib/environment.sh`)
@@ -77,17 +77,13 @@ oc process -f examples/console-oauth-client.yaml | oc apply -f -
 oc get oauthclient console-oauth-client -o jsonpath='{.secret}' > examples/console-client-secret
 ```
 
-If the CA bundle of the OpenShift API server is unavailable, fetch the CA
-certificates from a service account secret. Due to [upstream changes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#manually-create-an-api-token-for-a-serviceaccount),
-these service account secrets need to be created manually.
-Otherwise copy the CA bundle to
-`examples/ca.crt`:
+Create a long-lived API token Secret for the console ServiceAccount and extract it to the
+`examples` folder. This creates the `token` and `ca.crt` files, which are necessary for `bridge` to
+proxy API server requests:
 
 ```
-oc apply -f examples/sa-secrets.yaml
-oc get secrets -n default --field-selector type=kubernetes.io/service-account-token -o json | \
-    jq '.items[0].data."ca.crt"' -r | python -m base64 -d > examples/ca.crt
-# Note: use "openssl base64" because the "base64" tool is different between mac and linux
+oc apply -f examples/secret.yaml
+oc extract secret/off-cluster-token -n openshift-console --to ./examples --confirm
 ```
 
 Finally run the console and visit [localhost:9000](http://localhost:9000):
@@ -111,16 +107,19 @@ In order to enable the monitoring UI and see the "Observe" navigation item while
   ```
 
 #### Updating `tectonic-console-builder` image
-Updating `tectonic-console-builder` image is needed whenever there is a change in the build-time dependencies and/or go versions.
+The `tectonic-console-builder` image is used to run Cypress tests in CI. Updating it is
+needed when there is a change in the Node.js version. Note that the instance of `go` present
+in the container image is unused, because the backend tests use a different image.
 
-In order to update the `tectonic-console-builder` to a new version i.e. v27, follow these steps:
+In order to update the `tectonic-console-builder` to a new version (e.g., v29), follow these steps:
 
 1. Update the `tectonic-console-builder` image tag in files listed below:
    - .ci-operator.yaml
    - Dockerfile.dev
    - Dockerfile.plugins.demo
-   For example, `tectonic-console-builder:27`
-2. Update the dependencies in Dockerfile.builder file i.e. v18.0.0.
+   For example, `tectonic-console-builder:29`
+2. Update the dependencies in Dockerfile.builder file by setting the `NODE_VERSION`
+   and `YARN_VERSION` environment variables to the desired versions.
 3. Run `./push-builder.sh` script build and push the updated builder image to quay.io.
    Note: You can test the image using `./builder-run.sh ./build-backend.sh`.
    To update the image on quay.io, you need edit permission to the quay.io/coreos/  tectonic-console-builder repo.
@@ -465,6 +464,23 @@ this way, then 'none' will be used. Additionally, violation reporting is throttl
 spamming the telemetry service with repetitive data. Identical violations will not be
 reported more than once a day.
 
+In case of local developement of the dynamic plugin, just pass needed CSP directives address to the console server, using the `--content-security-policy` flag.
+
+Example:
+
+```
+./bin/bridge --content-security-policy script-src='localhost:1234',font-src='localhost:2345 localhost:3456'
+```
+
+List of configurable CSP directives is available in the [openshift/api repository](https://github.com/openshift/api/blob/master/console/v1/types_console_plugin.go#L102-L137).
+
+The list is extended automatically by the console server with following CSP directives:
+- `"frame-src 'none'"`
+- `"frame-ancestors 'none'"`
+- `"object-src 'none'"`
+
+Currently this feature is behind feature gate.
+
 ## Frontend Packages
 - [console-dynamic-plugin-sdk](./frontend/packages/console-dynamic-plugin-sdk/README.md)
 [[API]](./frontend/packages/console-dynamic-plugin-sdk/docs/api.md)
@@ -481,5 +497,32 @@ reported more than once a day.
 - [knative-plugin](./frontend/packages/knative-plugin/README.md)
 
 - operator-lifecycle-manager
+
+## Telemetry
+
+Console uses Segment Analytics for telemetry purposes. To test Console telemetry on local
+development environment, set up `BRIDGE_TELEMETRY` environment variable before running the
+Console Bridge server.
+
+```sh
+# https://github.com/openshift/console-operator/blob/main/manifests/05-telemetry-config.yaml
+API_HOST="console.redhat.com/connections/api/v1"
+JS_HOST="console.redhat.com/connections/cdn"
+PUBLIC_API_KEY="..." # Use API key from the link above
+
+# The BRIDGE_TELEMETRY variable contains a comma separated list of Console telemetry options
+export BRIDGE_TELEMETRY=\
+SEGMENT_API_HOST="${API_HOST}",\
+SEGMENT_JS_HOST="${JS_HOST}",\
+SEGMENT_API_KEY="${PUBLIC_API_KEY}",\
+DISABLED="false"
+
+# Run Bridge server, telemetry options should get passed to frontend as SERVER_FLAGS.telemetry
+./bin/bridge
+
+# If you no longer need the custom telemetry options, unset the BRIDGE_TELEMETRY variable
+unset BRIDGE_TELEMETRY
+```
+
 [[Descriptors README]](./frontend/packages/operator-lifecycle-manager/src/components/descriptors/README.md)
 [[Descriptors API Reference]](./frontend/packages/operator-lifecycle-manager/src/components/descriptors/reference/reference.md)

builder-run.sh

@@ -11,7 +11,7 @@ set -e
 # Without env vars:
 #   ./builder-run.sh ./my-script --my-script-arg1 --my-script-arg2
 
-BUILDER_IMAGE="quay.io/coreos/tectonic-console-builder:v28"
+BUILDER_IMAGE="quay.io/coreos/tectonic-console-builder:v29"
 
 # forward whitelisted env variables to docker
 ENV_STR=()

cmd/OWNERS

@@ -1,6 +1,7 @@
 reviewers:
   - TheRealJon
   - jhadvig
+  - Leo6Leo
 approvers:
   - TheRealJon
   - jhadvig