You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2023/01/11 17:50:05 UTC
[trafficcontrol] branch master updated: Rollback to Node to 16 for Centos 7 support (#7276)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new dac17ec89c Rollback to Node to 16 for Centos 7 support (#7276)
dac17ec89c is described below
commit dac17ec89c6563a6536cc216ae74fdeb41387e7c
Author: Steve Hamrick <sh...@users.noreply.github.com>
AuthorDate: Wed Jan 11 10:49:59 2023 -0700
Rollback to Node to 16 for Centos 7 support (#7276)
* Rollback to centos7 support node version (16)
* Update changelog
* Didnt mean to commit this
---
.github/workflows/tp.integration.tests.yml | 2 +-
.github/workflows/tpv2.yml | 6 ++---
CHANGELOG.md | 2 +-
dev/tpv2/Dockerfile | 2 +-
dev/traffic_portal/Dockerfile | 2 +-
docs/source/admin/traffic_portal/index.rst | 4 +--
docs/source/development/traffic_portal.rst | 2 +-
experimental/traffic-portal/README.md | 2 +-
experimental/traffic-portal/package-lock.json | 16 ++++++------
experimental/traffic-portal/package.json | 4 +--
.../cdn-in-a-box/traffic_portal/Dockerfile | 2 +-
.../traffic_portal_integration_test/Dockerfile | 2 +-
.../docker/build/Dockerfile-traffic_portal | 2 +-
traffic_portal/build/README.md | 2 +-
traffic_portal/build/traffic_portal.spec | 2 +-
traffic_portal/package-lock.json | 2 +-
traffic_portal/package.json | 2 +-
traffic_portal/test/integration/README.md | 2 +-
traffic_portal/test/integration/package-lock.json | 30 +++++++++++-----------
traffic_portal/test/integration/package.json | 6 ++---
20 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/.github/workflows/tp.integration.tests.yml b/.github/workflows/tp.integration.tests.yml
index eb4f8a6107..bf12f24283 100644
--- a/.github/workflows/tp.integration.tests.yml
+++ b/.github/workflows/tp.integration.tests.yml
@@ -20,7 +20,7 @@ name: TP Tests
env:
# alpine:3.13
ALPINE_VERSION: sha256:08d6ca16c60fe7490c03d10dc339d9fd8ea67c6466dea8d558526b1330a85930
- NODE_VERSION: 18
+ NODE_VERSION: 16
on:
push:
diff --git a/.github/workflows/tpv2.yml b/.github/workflows/tpv2.yml
index 6b4c335f0d..a65e4ea361 100644
--- a/.github/workflows/tpv2.yml
+++ b/.github/workflows/tpv2.yml
@@ -55,7 +55,7 @@ jobs:
- name: Node 18
uses: actions/setup-node@v3
with:
- node-version: 18.x
+ node-version: 16.x
- name: NPM install
if: steps.restore-npm-cache.cache-hit != 'true'
@@ -87,7 +87,7 @@ jobs:
- name: Node 18
uses: actions/setup-node@v3
with:
- node-version: 18.x
+ node-version: 16.x
- name: NPM install
if: steps.restore-npm-cache.cache-hit != 'true'
@@ -119,7 +119,7 @@ jobs:
- name: Node 18
uses: actions/setup-node@v3
with:
- node-version: 18.x
+ node-version: 16.x
- name: Install latest Chrome
run: sudo apt-get update && sudo apt-get install google-chrome-stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a266f123b1..a7bfd2bd95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- [#7037](https://github.com/apache/trafficcontrol/pull/7037) *Traffic Router* Uses Traffic Ops API 4.0 by default
- [#7191](https://github.com/apache/trafficcontrol/issues/7191) *tc-health-client* Uses Traffic Ops API 4.0. Also added reload option to systemd service file
- [#4654](https://github.com/apache/trafficcontrol/pull/4654) *Traffic Ops, Traffic Portal* Switched Delivery Service active state to a three-value system, adding a state that will be used to prevent cache servers from deploying DS configuration.
-- [#7242](https://github.com/apache/trafficcontrol/pull/7242) *Traffic Portal* Now depends on NodeJS version 18 or later.
+- [#7242](https://github.com/apache/trafficcontrol/pull/7276) *Traffic Portal* Now depends on NodeJS version 16 or later.
- [#7120](https://github.com/apache/trafficcontrol/pull/7120) *Docs* Update t3c documentation regarding parent.config parent_retry.
### Fixed
diff --git a/dev/tpv2/Dockerfile b/dev/tpv2/Dockerfile
index 20e42e63bf..e4a8be7e96 100644
--- a/dev/tpv2/Dockerfile
+++ b/dev/tpv2/Dockerfile
@@ -23,7 +23,7 @@ RUN openssl genrsa -passout pass:x -out server.pass.key 2048 && \
openssl rand 32 | base64 > /aes.key && \
chmod 644 /server.key /aes.key
-FROM node:18-alpine AS tpv2-dev
+FROM node:16-alpine AS tpv2-dev
ENV TC="/go/src/github.com/apache/trafficcontrol"
VOLUME $TC
diff --git a/dev/traffic_portal/Dockerfile b/dev/traffic_portal/Dockerfile
index ef35603e26..62a87f4b6f 100644
--- a/dev/traffic_portal/Dockerfile
+++ b/dev/traffic_portal/Dockerfile
@@ -22,7 +22,7 @@ RUN openssl genrsa -passout pass:x -out server.pass.key 2048 && \
openssl rand 32 | base64 > /aes.key && \
chmod 644 /server.key /aes.key
-FROM node:18-alpine AS trafficportal-dev
+FROM node:16-alpine AS trafficportal-dev
ENV TC="/go/src/github.com/apache/trafficcontrol"
VOLUME $TC
diff --git a/docs/source/admin/traffic_portal/index.rst b/docs/source/admin/traffic_portal/index.rst
index ceeb009b55..09b655df5f 100644
--- a/docs/source/admin/traffic_portal/index.rst
+++ b/docs/source/admin/traffic_portal/index.rst
@@ -22,12 +22,12 @@ Installing
==========
#. Build the Traffic Portal RPM using the instructions in :ref:`dev-building`.
#. Copy the Traffic Portal RPM to your server
-#. Install NodeJS. This can be done by building it from source, installing with :manpage:`yum(8)` if it happens to be in your available repositories (at version 18+), or using the NodeSource setup script.
+#. Install NodeJS. This can be done by building it from source, installing with :manpage:`yum(8)` if it happens to be in your available repositories (at version 16+), or using the NodeSource setup script.
.. code-block:: bash
:caption: Installing NodeJS using the NodeSource Setup Script
- curl --silent --location https://rpm.nodesource.com/setup_18.x | sudo bash -
+ curl --silent --location https://rpm.nodesource.com/setup_16.x | sudo bash -
#. Install the Traffic Portal RPM with :manpage:`yum(8)` or :manpage:`rpm(8)` e.g. by running ``yum install path/to/traffic_portal.rpm`` as the root user or with :manpage:`sudo(8)`.
diff --git a/docs/source/development/traffic_portal.rst b/docs/source/development/traffic_portal.rst
index cb44f0f3c1..eb825bc444 100644
--- a/docs/source/development/traffic_portal.rst
+++ b/docs/source/development/traffic_portal.rst
@@ -29,7 +29,7 @@ Software Requirements
=====================
To work on Traffic Portal you need a \*nix (MacOS and Linux are most commonly used) environment that has the following installed:
-* `Node.js 18.0.x or above <https://nodejs.org/en/>`_
+* `Node.js 16.0.x or above <https://nodejs.org/en/>`_
* `Grunt CLI 1.2.0 or above <https://github.com/gruntjs/grunt-cli>`_
* Access to a working instance of Traffic Ops
diff --git a/experimental/traffic-portal/README.md b/experimental/traffic-portal/README.md
index 7260354fa7..7291826178 100644
--- a/experimental/traffic-portal/README.md
+++ b/experimental/traffic-portal/README.md
@@ -21,7 +21,7 @@ CDN architectures. The eventual goal is to slowly eat Traffic Portal by
importing all of its functionality once the self-service UI is complete.
## Prerequisites
-Traffic Portal runs on [NodeJS](https://nodejs.org/) version 18 (or later) and
+Traffic Portal runs on [NodeJS](https://nodejs.org/) version 16 (or later) and
uses its built-in NPM package manager to manage dependencies.
## Building and Running
diff --git a/experimental/traffic-portal/package-lock.json b/experimental/traffic-portal/package-lock.json
index 88cbd14e4d..c886bb6bc1 100644
--- a/experimental/traffic-portal/package-lock.json
+++ b/experimental/traffic-portal/package-lock.json
@@ -50,7 +50,7 @@
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/nightwatch": "^2.3.14",
- "@types/node": "^18.11.12",
+ "@types/node": "^16.18.11",
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"axios": "^0.27.2",
@@ -73,7 +73,7 @@
"typescript": "^4.5.4"
},
"engines": {
- "node": ">=18"
+ "node": ">=16"
},
"optionalDependencies": {
"@compodoc/compodoc": "^1.1.18"
@@ -3926,9 +3926,9 @@
}
},
"node_modules/@types/node": {
- "version": "18.11.12",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.12.tgz",
- "integrity": "sha512-FgD3NtTAKvyMmD44T07zz2fEf+OKwutgBCEVM8GcvMGVGaDktiLNTDvPwC/LUe3PinMW+X6CuLOF2Ui1mAlSXg==",
+ "version": "16.18.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+ "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==",
"dev": true
},
"node_modules/@types/parse-json": {
@@ -21273,9 +21273,9 @@
}
},
"@types/node": {
- "version": "18.11.12",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.12.tgz",
- "integrity": "sha512-FgD3NtTAKvyMmD44T07zz2fEf+OKwutgBCEVM8GcvMGVGaDktiLNTDvPwC/LUe3PinMW+X6CuLOF2Ui1mAlSXg==",
+ "version": "16.18.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+ "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==",
"dev": true
},
"@types/parse-json": {
diff --git a/experimental/traffic-portal/package.json b/experimental/traffic-portal/package.json
index 0fe29a3d7f..b30bb941d7 100644
--- a/experimental/traffic-portal/package.json
+++ b/experimental/traffic-portal/package.json
@@ -24,7 +24,7 @@
"Traffic Portal"
],
"engines": {
- "node": ">=18"
+ "node": ">=16"
},
"engineStrict": true,
"scripts": {
@@ -90,7 +90,7 @@
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/nightwatch": "^2.3.14",
- "@types/node": "^18.11.12",
+ "@types/node": "^16.18.11",
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"axios": "^0.27.2",
diff --git a/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile b/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
index d4ff1efde7..cb4f0d01ed 100644
--- a/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_portal/Dockerfile
@@ -30,7 +30,7 @@ RUN if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
yum -y install dnf || exit 1; \
fi
-RUN curl -sL https://rpm.nodesource.com/setup_18.x | bash -
+RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash -
# Override TRAFFIC_PORTAL_RPM arg to use a different one using --build-arg TRAFFIC_PORTAL_RPM=... Can be local file or http://...
ARG TRAFFIC_PORTAL_RPM=traffic_portal/traffic_portal.rpm
diff --git a/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile b/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
index b22282f182..71a010f1b3 100644
--- a/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
+++ b/infrastructure/cdn-in-a-box/traffic_portal_integration_test/Dockerfile
@@ -47,7 +47,7 @@ RUN if [[ "${RHEL_VERSION%%.*}" -eq 7 ]]; then \
FROM os-dependencies AS node-dependencies
# Download and install node
-RUN curl -sL https://rpm.nodesource.com/setup_18.x | bash -
+RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash -
RUN dnf install -y nodejs
RUN npm i -g webdriver-manager
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index ffad25542e..28da94356a 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -40,7 +40,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-* && \
### traffic_portal specific
FROM common-dependencies AS traffic-portal
-RUN curl -sL https://rpm.nodesource.com/setup_18.x | bash - && \
+RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash - && \
yum -y install make nodejs && \
npm -g install grunt-cli sass
diff --git a/traffic_portal/build/README.md b/traffic_portal/build/README.md
index 73a8e8afb7..718434eea5 100644
--- a/traffic_portal/build/README.md
+++ b/traffic_portal/build/README.md
@@ -28,7 +28,7 @@
* Install the Node.js JavaScript runtime
```
- $ curl --silent --location https://rpm.nodesource.com/setup_18.x | sudo bash -
+ $ curl --silent --location https://rpm.nodesource.com/setup_16.x | sudo bash -
$ sudo yum install -y nodejs
```
diff --git a/traffic_portal/build/traffic_portal.spec b/traffic_portal/build/traffic_portal.spec
index 41abc75f9f..cca3afd7c9 100644
--- a/traffic_portal/build/traffic_portal.spec
+++ b/traffic_portal/build/traffic_portal.spec
@@ -25,7 +25,7 @@ License: Apache License, Version 2.0
URL: https://github.com/apache/trafficcontrol/
Source: %{_sourcedir}/traffic_portal-%{traffic_control_version}.tgz
AutoReqProv: no
-Requires: nodejs >= 2:18.0.0
+Requires: nodejs >= 2:16.0.0
%define traffic_portal_home /opt/traffic_portal
%description
diff --git a/traffic_portal/package-lock.json b/traffic_portal/package-lock.json
index d6d7a8517e..210f91a2ea 100644
--- a/traffic_portal/package-lock.json
+++ b/traffic_portal/package-lock.json
@@ -59,7 +59,7 @@
"time-grunt": "2.0.0"
},
"engines": {
- "node": ">=18"
+ "node": ">=16"
}
},
"node_modules/@ampproject/remapping": {
diff --git a/traffic_portal/package.json b/traffic_portal/package.json
index 1f5c39ec6a..429ac89c82 100644
--- a/traffic_portal/package.json
+++ b/traffic_portal/package.json
@@ -11,7 +11,7 @@
"test:ci": "karma start --single-run --browsers=ChromeHeadlessCustom karma.conf.js"
},
"engines": {
- "node": ">=18"
+ "node": ">=16"
},
"engineStrict": true,
"devDependencies": {
diff --git a/traffic_portal/test/integration/README.md b/traffic_portal/test/integration/README.md
index 4e1254740f..b4f613081a 100644
--- a/traffic_portal/test/integration/README.md
+++ b/traffic_portal/test/integration/README.md
@@ -20,7 +20,7 @@
This directory contains integration tests for Traffic Portal.
## Prerequisites
-* [Node](https://nodejs.org) version 18 or later.
+* [Node](https://nodejs.org) version 16 or later.
## Building and Running
To build and run the tests, one can use the `npm` (or `pnpm`) scripts.
diff --git a/traffic_portal/test/integration/package-lock.json b/traffic_portal/test/integration/package-lock.json
index 90cb5c90b9..d68e61e497 100644
--- a/traffic_portal/test/integration/package-lock.json
+++ b/traffic_portal/test/integration/package-lock.json
@@ -18,7 +18,7 @@
"fs-extra": "^8.1.0",
"jasmine-reporters": "^2.3.2",
"jasmine2-protractor-utils": "^1.3.0",
- "node": "^18.12.1",
+ "node": "^16",
"protractor": "^7.0.0",
"protractor-beautiful-reporter": "^1.3.6",
"protractor-html-reporter-2": "^1.0.4",
@@ -29,12 +29,12 @@
"devDependencies": {
"@types/fs-extra": "^9.0.9",
"@types/jasmine": "^3.4.6",
- "@types/node": "^18.11.12",
+ "@types/node": "^16",
"jasmine": "^3.5.0",
"typescript": "^3.6.4"
},
"engines": {
- "node": ">=12"
+ "node": ">=16"
}
},
"node_modules/@types/fs-extra": {
@@ -67,9 +67,9 @@
"integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA=="
},
"node_modules/@types/node": {
- "version": "18.11.12",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.12.tgz",
- "integrity": "sha512-FgD3NtTAKvyMmD44T07zz2fEf+OKwutgBCEVM8GcvMGVGaDktiLNTDvPwC/LUe3PinMW+X6CuLOF2Ui1mAlSXg=="
+ "version": "16.18.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+ "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="
},
"node_modules/@types/q": {
"version": "0.0.32",
@@ -1245,9 +1245,9 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node_modules/node": {
- "version": "18.12.1",
- "resolved": "https://registry.npmjs.org/node/-/node-18.12.1.tgz",
- "integrity": "sha512-zQ0AYW1IFDTP+0c+cp3Brn6l9VRvvhBiYCvJSKK/dM7ndMh5PCIi2nwJJ7uFJsGT3OlfLdqyA67G6Otcz1WYug==",
+ "version": "16.19.0",
+ "resolved": "https://registry.npmjs.org/node/-/node-16.19.0.tgz",
+ "integrity": "sha512-gVpwPuk8KZQjNYcuilyEcNLOAm97Q4GNvCrW5pZ9SiQH/shy/G4gInNzITEqF00lb6bjSzmYWCvGlomGkLm3/A==",
"hasInstallScript": true,
"dependencies": {
"node-bin-setup": "^1.0.0"
@@ -2425,9 +2425,9 @@
"integrity": "sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA=="
},
"@types/node": {
- "version": "18.11.12",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.12.tgz",
- "integrity": "sha512-FgD3NtTAKvyMmD44T07zz2fEf+OKwutgBCEVM8GcvMGVGaDktiLNTDvPwC/LUe3PinMW+X6CuLOF2Ui1mAlSXg=="
+ "version": "16.18.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.11.tgz",
+ "integrity": "sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="
},
"@types/q": {
"version": "0.0.32",
@@ -3368,9 +3368,9 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"node": {
- "version": "18.12.1",
- "resolved": "https://registry.npmjs.org/node/-/node-18.12.1.tgz",
- "integrity": "sha512-zQ0AYW1IFDTP+0c+cp3Brn6l9VRvvhBiYCvJSKK/dM7ndMh5PCIi2nwJJ7uFJsGT3OlfLdqyA67G6Otcz1WYug==",
+ "version": "16.19.0",
+ "resolved": "https://registry.npmjs.org/node/-/node-16.19.0.tgz",
+ "integrity": "sha512-gVpwPuk8KZQjNYcuilyEcNLOAm97Q4GNvCrW5pZ9SiQH/shy/G4gInNzITEqF00lb6bjSzmYWCvGlomGkLm3/A==",
"requires": {
"node-bin-setup": "^1.0.0"
}
diff --git a/traffic_portal/test/integration/package.json b/traffic_portal/test/integration/package.json
index 5aea1c063c..94a10a2158 100644
--- a/traffic_portal/test/integration/package.json
+++ b/traffic_portal/test/integration/package.json
@@ -13,7 +13,7 @@
"fs-extra": "^8.1.0",
"jasmine-reporters": "^2.3.2",
"jasmine2-protractor-utils": "^1.3.0",
- "node": "^18",
+ "node": "^16",
"protractor": "^7.0.0",
"protractor-beautiful-reporter": "^1.3.6",
"protractor-html-reporter-2": "^1.0.4",
@@ -24,7 +24,7 @@
"devDependencies": {
"@types/fs-extra": "^9.0.9",
"@types/jasmine": "^3.4.6",
- "@types/node": "^18",
+ "@types/node": "^16",
"jasmine": "^3.5.0",
"typescript": "^3.6.4"
},
@@ -40,7 +40,7 @@
"author": "Apache Software Foundation",
"license": "Apache-2.0",
"engines": {
- "node": ">=18"
+ "node": ">=16"
},
"engineStrict": true
}