From 9506c9977b8cde8beb3f0a70442a0b1f44756ecb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 31 Aug 2024 14:54:28 +0000 Subject: [PATCH 01/41] Bump micromatch in /workshop-images/base-environment/opt/helper Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../opt/helper/package-lock.json | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/workshop-images/base-environment/opt/helper/package-lock.json b/workshop-images/base-environment/opt/helper/package-lock.json index 3e645b5f..08baac7f 100644 --- a/workshop-images/base-environment/opt/helper/package-lock.json +++ b/workshop-images/base-environment/opt/helper/package-lock.json @@ -828,12 +828,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -1771,9 +1771,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -2609,12 +2609,12 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -4744,12 +4744,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browser-stdout": { @@ -5449,9 +5449,9 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" @@ -6080,12 +6080,12 @@ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, From a748ecdd2e392355fb1c025d765762fb8ee63be1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 00:03:38 +0000 Subject: [PATCH 02/41] Bump cryptography from 42.0.4 to 43.0.1 in /session-manager Bumps [cryptography](https://github.com/pyca/cryptography) from 42.0.4 to 43.0.1. - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/42.0.4...43.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- session-manager/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session-manager/requirements.txt b/session-manager/requirements.txt index b7707c43..a3d147b4 100644 --- a/session-manager/requirements.txt +++ b/session-manager/requirements.txt @@ -4,4 +4,4 @@ aiohttp==3.10.2 PyYAML==6.0.1 pykube-ng==23.6.0 wrapt==1.15.0 -cryptography==42.0.4 +cryptography==43.0.1 From 75ccf32eb37187770c0c8edf8f7e54e628432c92 Mon Sep 17 00:00:00 2001 From: Jorge Morales Pou Date: Thu, 12 Sep 2024 12:09:33 +0200 Subject: [PATCH 03/41] Force explicit disable of educates (#569) --- .../95-remove-educates-settings-disabled.yaml | 7 +++- .../test-kind-scenario-07c/description.md | 3 ++ .../kind/test-kind-scenario-07c/expected.yaml | 41 +++++++++++++++++++ .../kind/test-kind-scenario-07c/values.yaml | 12 ++++++ 4 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/description.md create mode 100644 carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/expected.yaml create mode 100644 carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/values.yaml diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/kind/95-remove-educates-settings-disabled.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/kind/95-remove-educates-settings-disabled.yaml index 4c013ef9..90408bef 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/kind/95-remove-educates-settings-disabled.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/kind/95-remove-educates-settings-disabled.yaml @@ -7,6 +7,9 @@ #@overlay/match-child-defaults missing_ok=True clusterPackages: educates: - #@ if/end isClusterPackageExplicitDisabled("educates"): + #@ if isClusterPackageExplicitDisabled("educates"): #@overlay/replace - settings: {} \ No newline at end of file + enabled: false + #@overlay/replace + settings: {} + #@ end \ No newline at end of file diff --git a/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/description.md b/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/description.md new file mode 100644 index 00000000..24904d59 --- /dev/null +++ b/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/description.md @@ -0,0 +1,3 @@ +kind with infrastructure.caCertificateRef and cert-manager enabled when they are in local secrets cache +and educates explicitly disabled +TODO: When pushing the local secrets in cache we need to configure educates to use the secret generated by cert-manager's wildcard cluster issuer diff --git a/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/expected.yaml b/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/expected.yaml new file mode 100644 index 00000000..1ac6069d --- /dev/null +++ b/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/expected.yaml @@ -0,0 +1,41 @@ +clusterPackages: + contour: + enabled: true + settings: + infraProvider: kind + contour: + replicas: 1 + configFileContents: + defaultHttpVersions: + - HTTP/1.1 + service: + type: ClusterIP + useHostPorts: true + cert-manager: + enabled: true + settings: + clusterResourceNamespace: educates-secrets + external-dns: + enabled: false + settings: {} + certs: + enabled: true + settings: + domains: + - educates.example.com + certProvider: local + local: + caCertificateRef: + name: educates-example-com-fromcache-ca + namespace: educates-secrets + wildcardCertificateNamespace: educates-secrets + certmanagerClusterResourceNamespace: educates-secrets + kyverno: + enabled: true + settings: {} + kapp-controller: + enabled: false + settings: {} + educates: + enabled: false + settings: {} \ No newline at end of file diff --git a/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/values.yaml b/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/values.yaml new file mode 100644 index 00000000..2b20073a --- /dev/null +++ b/carvel-packages/installer/scenarios/kind/test-kind-scenario-07c/values.yaml @@ -0,0 +1,12 @@ +clusterInfrastructure: + provider: "kind" + caCertificateRef: + name: "educates-example-com-fromcache-ca" + namespace: "educates-secrets" +clusterPackages: + educates: + enabled: false +clusterSecurity: + policyEngine: "kyverno" +clusterIngress: + domain: "educates.example.com" From a99843298fb9b6ce7613cc1f4db5976ebf8bca4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Sep 2024 16:01:34 +0000 Subject: [PATCH 04/41] Bump path-to-regexp and express Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) to 0.1.10 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `path-to-regexp` from 0.1.7 to 0.1.10 - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](https://github.com/pillarjs/path-to-regexp/compare/v0.1.7...v0.1.10) Updates `express` from 4.19.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../opt/gateway/package-lock.json | 193 ++++++++++-------- .../base-environment/opt/gateway/package.json | 2 +- 2 files changed, 107 insertions(+), 88 deletions(-) diff --git a/workshop-images/base-environment/opt/gateway/package-lock.json b/workshop-images/base-environment/opt/gateway/package-lock.json index 6029b82f..c04ca420 100644 --- a/workshop-images/base-environment/opt/gateway/package-lock.json +++ b/workshop-images/base-environment/opt/gateway/package-lock.json @@ -22,7 +22,7 @@ "cors": "^2.8.5", "css-element-queries": "^1.2.3", "elliptic": ">=6.5.4", - "express": "^4.19.2", + "express": "^4.21.0", "express-basic-auth": "^1.2.1", "express-session": "^1.17.3", "fontfaceobserver": "^2.3.0", @@ -841,9 +841,9 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -853,7 +853,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1698,9 +1698,9 @@ "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -1773,36 +1773,36 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -1870,12 +1870,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -2706,9 +2706,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/methods": { "version": "1.1.2", @@ -2956,9 +2959,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3172,9 +3178,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/path/node_modules/inherits": { "version": "2.0.3", @@ -3428,11 +3434,11 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -3653,9 +3659,9 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -3675,20 +3681,28 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -5207,9 +5221,9 @@ "dev": true }, "body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "requires": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -5219,7 +5233,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -5955,9 +5969,9 @@ "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==" }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "es-define-property": { "version": "1.0.0", @@ -6009,36 +6023,36 @@ } }, "express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -6096,12 +6110,12 @@ } }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -6705,9 +6719,9 @@ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" }, "methods": { "version": "1.1.2", @@ -6896,9 +6910,9 @@ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "on-finished": { "version": "2.4.1", @@ -7080,9 +7094,9 @@ } }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "pbkdf2": { "version": "3.1.2", @@ -7296,11 +7310,11 @@ } }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "querystring": { @@ -7462,9 +7476,9 @@ } }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "requires": { "debug": "2.6.9", "depd": "2.0.0", @@ -7481,6 +7495,11 @@ "statuses": "2.0.1" }, "dependencies": { + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7489,14 +7508,14 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" } }, "set-blocking": { diff --git a/workshop-images/base-environment/opt/gateway/package.json b/workshop-images/base-environment/opt/gateway/package.json index d9733743..47de728e 100644 --- a/workshop-images/base-environment/opt/gateway/package.json +++ b/workshop-images/base-environment/opt/gateway/package.json @@ -24,7 +24,7 @@ "cors": "^2.8.5", "css-element-queries": "^1.2.3", "elliptic": ">=6.5.4", - "express": "^4.19.2", + "express": "^4.21.0", "express-basic-auth": "^1.2.1", "express-session": "^1.17.3", "fontfaceobserver": "^2.3.0", From 1d99b279616e7c217758e2607a2ac3ef67a04a9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:47:24 +0000 Subject: [PATCH 05/41] Bump body-parser and express Bumps [body-parser](https://github.com/expressjs/body-parser) to 1.20.3 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `body-parser` from 1.20.2 to 1.20.3 - [Release notes](https://github.com/expressjs/body-parser/releases) - [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md) - [Commits](https://github.com/expressjs/body-parser/compare/1.20.2...1.20.3) Updates `express` from 4.19.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: body-parser dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../opt/helper/package-lock.json | 476 ++++++++++++------ .../base-environment/opt/helper/package.json | 2 +- 2 files changed, 331 insertions(+), 147 deletions(-) diff --git a/workshop-images/base-environment/opt/helper/package-lock.json b/workshop-images/base-environment/opt/helper/package-lock.json index 08baac7f..23fd453d 100644 --- a/workshop-images/base-environment/opt/helper/package-lock.json +++ b/workshop-images/base-environment/opt/helper/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "ansi-regex": ">=6.0.1", - "express": "^4.19.2", + "express": "^4.21.0", "minimist": ">=1.2.7", "regexp-match-indices": "^1.0.2", "yaml": "^1.10.2" @@ -776,9 +776,9 @@ } }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -788,7 +788,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -888,12 +888,18 @@ } }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -1200,6 +1206,22 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1327,9 +1349,9 @@ "dev": true }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -1356,6 +1378,25 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -1641,36 +1682,36 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -1783,12 +1824,12 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -1900,9 +1941,12 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/get-caller-file": { "version": "2.0.5", @@ -1914,13 +1958,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -2020,23 +2069,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -2046,6 +2095,28 @@ "node": ">=4" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", @@ -2057,6 +2128,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -2587,9 +2669,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge2": { "version": "1.4.1", @@ -2920,9 +3005,12 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3091,9 +3179,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/path-type": { "version": "4.0.0", @@ -3197,11 +3285,11 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -3480,9 +3568,9 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -3515,6 +3603,14 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -3530,19 +3626,35 @@ } }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" } }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -3576,13 +3688,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4694,9 +4810,9 @@ } }, "body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "requires": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -4706,7 +4822,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -4781,12 +4897,15 @@ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" }, "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" } }, "callsites": { @@ -5010,6 +5129,16 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, + "define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "requires": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + } + }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -5100,9 +5229,9 @@ "dev": true }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "end-of-stream": { "version": "1.4.4", @@ -5120,6 +5249,19 @@ "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true }, + "es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "requires": { + "get-intrinsic": "^1.2.4" + } + }, + "es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==" + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -5327,36 +5469,36 @@ "optional": true }, "express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -5458,12 +5600,12 @@ } }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -5549,9 +5691,9 @@ "optional": true }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "get-caller-file": { "version": "2.0.5", @@ -5560,13 +5702,15 @@ "dev": true }, "get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.3" + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" } }, "github-from-package": { @@ -5641,31 +5785,52 @@ "slash": "^3.0.0" } }, + "gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "requires": { + "get-intrinsic": "^1.1.3" + } + }, "graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "requires": { - "function-bind": "^1.1.1" - } - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true }, + "has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "requires": { + "es-define-property": "^1.0.0" + } + }, + "has-proto": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" + }, "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "requires": { + "function-bind": "^1.1.2" + } + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -6064,9 +6229,9 @@ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" }, "merge2": { "version": "1.4.1", @@ -6314,9 +6479,9 @@ } }, "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "on-finished": { "version": "2.4.1", @@ -6442,9 +6607,9 @@ "dev": true }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "path-type": { "version": "4.0.0", @@ -6524,11 +6689,11 @@ "dev": true }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "queue-microtask": { @@ -6716,9 +6881,9 @@ } }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "requires": { "debug": "2.6.9", "depd": "2.0.0", @@ -6750,6 +6915,11 @@ } } }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -6767,14 +6937,27 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" + } + }, + "set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "requires": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" } }, "setimmediate": { @@ -6804,13 +6987,14 @@ "dev": true }, "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" } }, "simple-concat": { diff --git a/workshop-images/base-environment/opt/helper/package.json b/workshop-images/base-environment/opt/helper/package.json index e8538199..e8427ba0 100644 --- a/workshop-images/base-environment/opt/helper/package.json +++ b/workshop-images/base-environment/opt/helper/package.json @@ -27,7 +27,7 @@ "watch": "tsc -watch -p ./" }, "dependencies": { - "express": "^4.19.2", + "express": "^4.21.0", "regexp-match-indices": "^1.0.2", "yaml": "^1.10.2", "ansi-regex": ">=6.0.1", From 2466fb29f72cd0c308f6abed71b9dc685be9bdb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:47:27 +0000 Subject: [PATCH 06/41] Bump serve-static and express Bumps [serve-static](https://github.com/expressjs/serve-static) to 1.16.2 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `serve-static` from 1.15.0 to 1.16.2 - [Release notes](https://github.com/expressjs/serve-static/releases) - [Changelog](https://github.com/expressjs/serve-static/blob/v1.16.2/HISTORY.md) - [Commits](https://github.com/expressjs/serve-static/compare/v1.15.0...v1.16.2) Updates `express` from 4.19.2 to 4.21.0 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: serve-static dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../opt/renderer/package-lock.json | 193 ++++++++++-------- .../opt/renderer/package.json | 2 +- 2 files changed, 107 insertions(+), 88 deletions(-) diff --git a/workshop-images/base-environment/opt/renderer/package-lock.json b/workshop-images/base-environment/opt/renderer/package-lock.json index 12e19319..8808eb69 100644 --- a/workshop-images/base-environment/opt/renderer/package-lock.json +++ b/workshop-images/base-environment/opt/renderer/package-lock.json @@ -16,7 +16,7 @@ "cached-path-relative": ">=1.1.0", "color-string": "^1.9.1", "elliptic": ">=6.5.4", - "express": "^4.19.2", + "express": "^4.21.0", "highlight.js": "^11.9.0", "jquery": "^3.7.1", "js-yaml": "^4.1.0", @@ -621,9 +621,9 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -633,7 +633,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -1332,9 +1332,9 @@ "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "engines": { "node": ">= 0.8" } @@ -1399,36 +1399,36 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -1451,12 +1451,12 @@ "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -2120,9 +2120,12 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/methods": { "version": "1.1.2", @@ -2299,9 +2302,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2412,9 +2418,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "node_modules/pbkdf2": { "version": "3.1.2", @@ -2606,11 +2612,11 @@ "dev": true }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -2785,9 +2791,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -2807,20 +2813,28 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -3960,9 +3974,9 @@ "dev": true }, "body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "requires": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -3972,7 +3986,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -4594,9 +4608,9 @@ "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==" }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==" }, "es-define-property": { "version": "1.0.0", @@ -4643,36 +4657,36 @@ } }, "express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -4692,12 +4706,12 @@ "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==" }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -5198,9 +5212,9 @@ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==" }, "methods": { "version": "1.1.2", @@ -5336,9 +5350,9 @@ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" }, "object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==" }, "on-finished": { "version": "2.4.1", @@ -5431,9 +5445,9 @@ "dev": true }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==" }, "pbkdf2": { "version": "3.1.2", @@ -5618,11 +5632,11 @@ "dev": true }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "querystring": { @@ -5754,9 +5768,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "requires": { "debug": "2.6.9", "depd": "2.0.0", @@ -5773,6 +5787,11 @@ "statuses": "2.0.1" }, "dependencies": { + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -5781,14 +5800,14 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" } }, "set-function-length": { diff --git a/workshop-images/base-environment/opt/renderer/package.json b/workshop-images/base-environment/opt/renderer/package.json index 25dacfaf..970fe8bd 100644 --- a/workshop-images/base-environment/opt/renderer/package.json +++ b/workshop-images/base-environment/opt/renderer/package.json @@ -21,7 +21,7 @@ "cached-path-relative": ">=1.1.0", "color-string": "^1.9.1", "elliptic": ">=6.5.4", - "express": "^4.19.2", + "express": "^4.21.0", "highlight.js": "^11.9.0", "jquery": "^3.7.1", "js-yaml": "^4.1.0", From 6b8d0152aa060ad1879708299f7b886752cfdd8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:50:30 +0000 Subject: [PATCH 07/41] Bump elliptic in /workshop-images/base-environment/opt/renderer Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.4 to 6.5.7. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.4...v6.5.7) --- updated-dependencies: - dependency-name: elliptic dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../opt/renderer/package-lock.json | 15 +++++++-------- .../base-environment/opt/renderer/package.json | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/workshop-images/base-environment/opt/renderer/package-lock.json b/workshop-images/base-environment/opt/renderer/package-lock.json index 8808eb69..f1c92cef 100644 --- a/workshop-images/base-environment/opt/renderer/package-lock.json +++ b/workshop-images/base-environment/opt/renderer/package-lock.json @@ -15,7 +15,6 @@ "bootstrap": "^5.3.2", "cached-path-relative": ">=1.1.0", "color-string": "^1.9.1", - "elliptic": ">=6.5.4", "express": "^4.21.0", "highlight.js": "^11.9.0", "jquery": "^3.7.1", @@ -44,7 +43,7 @@ "@types/underscore.string": "^0.0.41", "browserify": "^17.0.0", "cached-path-relative": ">=1.1.0", - "elliptic": ">=6.5.4", + "elliptic": ">=6.5.7", "minimist": ">=1.2.7", "path-parse": ">=1.0.7", "typescript": "^5.2.2", @@ -1301,9 +1300,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", "dev": true, "dependencies": { "bn.js": "^4.11.9", @@ -4575,9 +4574,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "elliptic": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", - "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", "dev": true, "requires": { "bn.js": "^4.11.9", diff --git a/workshop-images/base-environment/opt/renderer/package.json b/workshop-images/base-environment/opt/renderer/package.json index 970fe8bd..2e73c574 100644 --- a/workshop-images/base-environment/opt/renderer/package.json +++ b/workshop-images/base-environment/opt/renderer/package.json @@ -20,7 +20,7 @@ "bootstrap": "^5.3.2", "cached-path-relative": ">=1.1.0", "color-string": "^1.9.1", - "elliptic": ">=6.5.4", + "elliptic": ">=6.5.7", "express": "^4.21.0", "highlight.js": "^11.9.0", "jquery": "^3.7.1", @@ -49,7 +49,7 @@ "@types/underscore.string": "^0.0.41", "browserify": "^17.0.0", "cached-path-relative": ">=1.1.0", - "elliptic": ">=6.5.4", + "elliptic": ">=6.5.7", "minimist": ">=1.2.7", "path-parse": ">=1.0.7", "typescript": "^5.2.2", From d0bae07626018f93c14d86d4e37c46bca31448e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:50:43 +0000 Subject: [PATCH 08/41] Bump micromatch in /workshop-images/base-environment/opt/gateway Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.5...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../opt/gateway/package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/workshop-images/base-environment/opt/gateway/package-lock.json b/workshop-images/base-environment/opt/gateway/package-lock.json index c04ca420..75ad86da 100644 --- a/workshop-images/base-environment/opt/gateway/package-lock.json +++ b/workshop-images/base-environment/opt/gateway/package-lock.json @@ -2722,11 +2722,11 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -6729,11 +6729,11 @@ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, From e4e19200cd74249bc19d06352dd614ae701f1448 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Sun, 15 Sep 2024 10:59:23 +1000 Subject: [PATCH 09/41] Update release notes for 3.0.1. --- project-docs/index.rst | 1 + project-docs/release-notes/version-3.0.1.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 project-docs/release-notes/version-3.0.1.md diff --git a/project-docs/index.rst b/project-docs/index.rst index aaf1af4f..bba4156e 100644 --- a/project-docs/index.rst +++ b/project-docs/index.rst @@ -81,6 +81,7 @@ Educates :maxdepth: 2 :caption: Release Notes: + release-notes/version-3.0.1 release-notes/version-3.0.0 release-notes/version-2.7.2 release-notes/version-2.7.1 diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md new file mode 100644 index 00000000..977bf340 --- /dev/null +++ b/project-docs/release-notes/version-3.0.1.md @@ -0,0 +1,17 @@ +Version 3.0.1 +============= + +Upcoming Changes +---------------- + +For details on significant changes in future versions, including feature +deprecations and removals which may necessitate updates to existing workshops, +see [Upcoming changes](upcoming-changes). + +Bugs Fixed +---------- + +* When the `kind` infastructure provider was selected for the opinionated + installer, if a CA certificate was provided and installation of `educates` + training platform component was being disabled, the latter was still being + installed even though disabled. From bee628209af254999dfe0239220927c87f5492c3 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Sun, 15 Sep 2024 11:14:21 +1000 Subject: [PATCH 10/41] Package updates due to CVEs. --- docker-extension/ui/package-lock.json | 9 +++++---- .../base-environment/opt/gateway/package-lock.json | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docker-extension/ui/package-lock.json b/docker-extension/ui/package-lock.json index 55ca7b02..dccf9365 100644 --- a/docker-extension/ui/package-lock.json +++ b/docker-extension/ui/package-lock.json @@ -5343,12 +5343,13 @@ "dev": true }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { diff --git a/workshop-images/base-environment/opt/gateway/package-lock.json b/workshop-images/base-environment/opt/gateway/package-lock.json index 75ad86da..d402e7db 100644 --- a/workshop-images/base-environment/opt/gateway/package-lock.json +++ b/workshop-images/base-environment/opt/gateway/package-lock.json @@ -1662,9 +1662,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/elliptic": { - "version": "6.5.6", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz", - "integrity": "sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", "dev": true, "dependencies": { "bn.js": "^4.11.9", @@ -5931,9 +5931,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "elliptic": { - "version": "6.5.6", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz", - "integrity": "sha512-mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==", + "version": "6.5.7", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", + "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", "dev": true, "requires": { "bn.js": "^4.11.9", From a689ce231a763deaa48087f220fef6de028d7b6f Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Sun, 15 Sep 2024 15:16:32 +1000 Subject: [PATCH 11/41] Lookup existing session before filtering portals. --- lookup-service/service/routes/workshops.py | 50 ++++++++++++---------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/lookup-service/service/routes/workshops.py b/lookup-service/service/routes/workshops.py index 4f47dddf..a4812592 100644 --- a/lookup-service/service/routes/workshops.py +++ b/lookup-service/service/routes/workshops.py @@ -86,6 +86,8 @@ async def api_post_v1_workshops(request: web.Request) -> web.Response: data = await request.json() + service_state = request.app["service_state"] + client = request["remote_client"] tenant_name = data.get("tenantName") @@ -121,8 +123,6 @@ async def api_post_v1_workshops(request: web.Request) -> web.Response: # Check that client is allowed access to this tenant. - client = request["remote_client"] - if not client.allowed_access_to_tenant(tenant_name): logger.warning( "Client %r not allowed access to tenant %r", client.name, tenant_name @@ -130,9 +130,32 @@ async def api_post_v1_workshops(request: web.Request) -> web.Response: return web.Response(text="Client not allowed access to tenant", status=403) - # Find the portals accessible to the tenant which hosts the workshop. + # If a user ID is supplied, check all of the portals to see if this user + # already has a workshop session for this workshop. This is done before + # checking whether a portal is accessible to the tenant so depends on the + # user ID being unique across all tenants. We do it before checking access + # to the tenant so that we can return a session if the user already has one + # even if the tenant no longer has access because of label changes. + + cluster_database = service_state.cluster_database + + if user_id: + for cluster in cluster_database.get_clusters(): + for portal in cluster.get_portals(): + session = portal.find_existing_workshop_session_for_user( + user_id, workshop_name + ) + + if session: + data = await session.reacquire_workshop_session(index_url) + + if data: + data["tenantName"] = tenant_name + return web.json_response(data) + + # Get the list of portals hosting the workshop and calculate the subset that + # are accessible to the tenant. - service_state = request.app["service_state"] tenant_database = service_state.tenant_database tenant = tenant_database.get_tenant(tenant_name) @@ -142,9 +165,6 @@ async def api_post_v1_workshops(request: web.Request) -> web.Response: return web.Response(text="Tenant not available", status=503) - # Get the list of portals hosting the workshop and calculate the subset - # that are accessible to the tenant. - accessible_portals = tenant.portals_which_are_accessible() selected_portals = [] @@ -166,22 +186,6 @@ async def api_post_v1_workshops(request: web.Request) -> web.Response: return web.Response(text="Workshop not available", status=503) - # If a user ID is supplied, check each of the portals to see if this user - # already has a workshop session for this workshop. - - if user_id: - for portal in selected_portals: - session = portal.find_existing_workshop_session_for_user( - user_id, workshop_name - ) - - if session: - data = await session.reacquire_workshop_session(index_url) - - if data: - data["tenantName"] = tenant_name - return web.json_response(data) - # Find the set of workshop environments for the specified workshop that are # in a running state. If there are no such environments, then the workshop # is not available. From 5e7f4643febcf2650e0d4791c7f9d97ccba8e151 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Sun, 15 Sep 2024 16:09:41 +1000 Subject: [PATCH 12/41] Add release notes about lookup of existing workshop session. --- project-docs/release-notes/version-3.0.1.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index 977bf340..d5993e89 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -8,6 +8,25 @@ For details on significant changes in future versions, including feature deprecations and removals which may necessitate updates to existing workshops, see [Upcoming changes](upcoming-changes). +Features Changed +---------------- + +* When requesting a workshop session using the lookup service, a search for an + existing session for that workshop and user is now made against all training + portals across all clusters. This is done before filtering out what training + portals are accessible to a tenant. This is done so an existing workshop + session is found even if labels for clusters or portals had been changed such + that the training portal is no longer mapped to the tenant. Such changes to + labels may have been made to prevent creation of new workshop sessions against + a cluster or training portal when rolling over to a new cluster and waiting + for existing workshop sessions on the old cluster to expire. Note that this + relies on client side user IDs to be unique across all tenants hosted by the + clusters the lookup service monitors. If a single lookup service is being used + by multiple distinct custom front end web portals and it is possible the same + user ID could be used by more than one front end, it is recommended that the + front end incorporate the tenant name as part of the client side user ID + passed to the lookup service. + Bugs Fixed ---------- From 7929af8b7fa9ba77ba810c88943be3079dde43f6 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 17 Sep 2024 14:31:17 +1000 Subject: [PATCH 13/41] Ensure that local educates config directory created by CLI. --- client-programs/pkg/cluster/kindcluster.go | 11 ++++++++++- client-programs/pkg/resolver/resolver.go | 6 +++++- go.work.sum | 15 +++++++++++++++ project-docs/release-notes/version-3.0.1.md | 4 ++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/client-programs/pkg/cluster/kindcluster.go b/client-programs/pkg/cluster/kindcluster.go index a95e5d43..332aaf2f 100644 --- a/client-programs/pkg/cluster/kindcluster.go +++ b/client-programs/pkg/cluster/kindcluster.go @@ -80,7 +80,16 @@ func (o *KindClusterConfig) CreateCluster(config *config.InstallationConfig, ima } // Save the cluster config to a file - kindConfigPath := filepath.Join(utils.GetEducatesHomeDir(), "educates-cluster-config.yaml") + + configFileDir := utils.GetEducatesHomeDir() + + err = os.MkdirAll(configFileDir, os.ModePerm) + + if err != nil { + return errors.Wrapf(err, "unable to create config directory") + } + + kindConfigPath := filepath.Join(configFileDir, "educates-cluster-config.yaml") err = os.WriteFile(kindConfigPath, clusterConfigData.Bytes(), 0644) if err != nil { return errors.Wrap(err, "failed to write cluster config to file") diff --git a/client-programs/pkg/resolver/resolver.go b/client-programs/pkg/resolver/resolver.go index dcf347ee..78dab651 100644 --- a/client-programs/pkg/resolver/resolver.go +++ b/client-programs/pkg/resolver/resolver.go @@ -102,7 +102,11 @@ func DeployResolver(domain string, targetAddress string, extraDomains []string) configFileDir := utils.GetEducatesHomeDir() configFileName := path.Join(configFileDir, "dnsmasq.conf") - _ = os.Mkdir(configFileDir, os.ModePerm) + err = os.MkdirAll(configFileDir, os.ModePerm) + + if err != nil { + return errors.Wrapf(err, "unable to create config directory") + } err = os.WriteFile(configFileName, clusterConfigData.Bytes(), 0644) diff --git a/go.work.sum b/go.work.sum index 7d67f7bc..b5a68c46 100644 --- a/go.work.sum +++ b/go.work.sum @@ -167,6 +167,7 @@ github.com/Azure/go-autorest/autorest/azure/auth v0.5.11/go.mod h1:84w/uV8E37feW github.com/Azure/go-autorest/autorest/azure/cli v0.4.1/go.mod h1:JfDgiIO1/RPu6z42AdQTyjOoCM2MFhLqSBDvMEkDgcg= github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab/go.mod h1:3VYc5hodBMJ5+l/7J4xAyMeuM2PNuepvHlGs8yilUCA= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -204,6 +205,7 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/cheggaaa/pb/v3 v3.1.4/go.mod h1:6wVjILNBaXMs8c21qRiaUM8BR82erfgau1DQ4iUXmSA= github.com/chrismellard/docker-credential-acr-env v0.0.0-20220327082430-c57b701bfc08/go.mod h1:MAuu1uDJNOS3T3ui0qmKdPUwm59+bO19BbTph2wZafE= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -211,6 +213,7 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= @@ -248,6 +251,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.11.1/go.mod h1:uhMcXKCQMEJHiAb0w+YGefQLaTEw+YhGluxZkrTmD0g= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v1.0.2/go.mod h1:GpiZQP3dDbg4JouG/NNS7QWXpgx6x8QiMKdmN72jogE= +github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= @@ -309,6 +313,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= @@ -356,6 +361,7 @@ github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU= github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= @@ -388,6 +394,7 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/libopenstorage/openstorage v1.0.0/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= @@ -403,10 +410,13 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/maxbrunsfeld/counterfeiter/v6 v6.7.0/go.mod h1:RVP6/F85JyxTrbJxWIdKU2vlSvK48iCMnMXRkSz7xtg= github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1/go.mod h1:eyp4DdUJAKkr9tvxR3jWhw2mDK7CWABMG5r9uyaKC7I= +github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -448,6 +458,7 @@ github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJf github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= +github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= @@ -471,9 +482,11 @@ github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRci github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= +github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vmware-tanzu/carvel-imgpkg v0.36.0 h1:ha5a3WUPaqpGlP+QRkKBA9WyT85vUPh7+57x94Cmj58= github.com/vmware-tanzu/carvel-imgpkg v0.36.0/go.mod h1:8HeIt+froyx7iRjyZ/4py2wFMPXEFNyWUNUTQgAjD8M= github.com/vmware-tanzu/carvel-imgpkg v0.38.2/go.mod h1:v9BcO1qfXwwIQFw2zmksdUkx8eI1e+/a0Md3xG2BzDE= @@ -828,9 +841,11 @@ google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index d5993e89..df817a70 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -34,3 +34,7 @@ Bugs Fixed installer, if a CA certificate was provided and installation of `educates` training platform component was being disabled, the latter was still being installed even though disabled. + +* If a locally managed config file had not been created using the command + `educates local config edit` prior to running `educates create-cluster`, it + would fail as the local config directory wasn't being created automatically. From 9b6703db7a1c6dde3c3b5cc9bd47a7647cef19ec Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 17 Sep 2024 19:13:26 +1000 Subject: [PATCH 14/41] For custom provider must still use builtin CLI values. --- .../custom/80-copy-educates-config.yaml | 12 ++++++------ .../_ytt_lib/infrastructure/custom/educates.lib.yaml | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml index 59fdcb48..7c3d3b71 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml @@ -1,10 +1,10 @@ #@ load("@ytt:data", "data") #@ load("@ytt:overlay", "overlay") -#@ load("educates.lib.yaml", "copy_all_educates_values") +#@ load("educates.lib.yaml", "copy_builtin_cli_values") -#! This copies user provided values for the custom infrastructure provider. +#! This copies only builtin CLI provides values. -#! #@overlay/match-child-defaults missing_ok=True -#! clusterPackages: -#! educates: -#! settings: #@ copy_all_educates_values() +#@overlay/match-child-defaults missing_ok=True +clusterPackages: + educates: + settings: #@ copy_builtin_cli_values() diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml index 3cba7762..88369b4f 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml @@ -172,3 +172,14 @@ lookupService: #@ if/end hasattr(data.values.lookupService, "ingressPrefix") and data.values.lookupService.ingressPrefix != None: ingressPrefix: #@ data.values.lookupService.ingressPrefix #@ end + +#@ def copy_builtin_cli_values(): +#@ if/end hasattr(data.values, "imageRegistry") and data.values.imageRegistry != None: +imageRegistry: + #@ if/end hasattr(data.values.imageRegistry, "namespace") and data.values.imageRegistry.namespace != None: + namespace: #@ data.values.imageRegistry.namespace + #@ if/end hasattr(data.values.imageRegistry, "host") and data.values.imageRegistry.host != None: + host: #@ data.values.imageRegistry.host +#@ if/end hasattr(data.values, "version") and data.values.version != None: +version: #@ data.values.version +#@ end From 01d9ca5b7edfed7f8e950e4beaeb7d66c0f06b94 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 17 Sep 2024 20:24:20 +1000 Subject: [PATCH 15/41] Need to ensure CLI builtin values are merged and not replaced. --- .../ytt/_ytt_lib/infrastructure/custom/90-overlays.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/90-overlays.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/90-overlays.yaml index 27247f98..5c187f92 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/90-overlays.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/90-overlays.yaml @@ -21,6 +21,8 @@ clusterPackages: kapp-controller: #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "kapp-controller") and hasattr(data.values.clusterPackages["kapp-controller"], "settings"): settings: #@ data.values.clusterPackages["kapp-controller"].settings + +#@overlay/merge educates: - #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "educates") and hasattr(data.values.clusterPackages["educates"], "settings"): + #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "educates") and hasattr(data.values.clusterPackages["educates"], "settings") and data.values.clusterPackages["educates"].settings: settings: #@ data.values.clusterPackages["educates"].settings From 7d32622b5179dfe117932d2c3929276c8ba93378 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Tue, 17 Sep 2024 21:14:37 +1000 Subject: [PATCH 16/41] The image repository and version details must be pushed into ytt data values. --- client-programs/pkg/cmd/admin_platform_config_cmd.go | 12 ++++++++++++ client-programs/pkg/cmd/admin_platform_deploy_cmd.go | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/client-programs/pkg/cmd/admin_platform_config_cmd.go b/client-programs/pkg/cmd/admin_platform_config_cmd.go index 44839281..3676cf12 100644 --- a/client-programs/pkg/cmd/admin_platform_config_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_config_cmd.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "strings" "github.com/spf13/cobra" @@ -57,6 +58,17 @@ func (o *PlatformConfigOptions) Run() error { return err } + fullConfig.Version = o.Version + + // Set image registry host and namespace by splitting the package + // repository into host and namespace. That is split on the first '/'. + + imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] + imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] + + fullConfig.ImageRegistry.Host = imageRepositoryHost + fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace + config.PrintConfigToStdout(fullConfig) } diff --git a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go index a573b2d5..0d2b0e23 100644 --- a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go @@ -2,6 +2,7 @@ package cmd import ( "fmt" + "strings" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -72,6 +73,17 @@ func (o *PlatformDeployOptions) Run() error { return err } + fullConfig.Version = o.Version + + // Set image registry host and namespace by splitting the package + // repository into host and namespace. That is split on the first '/'. + + imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] + imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] + + fullConfig.ImageRegistry.Host = imageRepositoryHost + fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace + if o.DryRun { if err = installer.DryRun(o.Version, o.PackageRepository, fullConfig, o.Verbose, false, o.skipImageResolution); err != nil { return errors.Wrap(err, "educates could not be installed") From 823aa3d5f0df8d1498a0a6aec1ee4e0d7f6ed770 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 02:09:10 +0000 Subject: [PATCH 17/41] Bump vite from 4.5.3 to 4.5.5 in /docker-extension/ui Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.5.3 to 4.5.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v4.5.5/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v4.5.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- docker-extension/ui/package-lock.json | 8 ++++---- docker-extension/ui/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-extension/ui/package-lock.json b/docker-extension/ui/package-lock.json index dccf9365..7cf60f55 100644 --- a/docker-extension/ui/package-lock.json +++ b/docker-extension/ui/package-lock.json @@ -27,7 +27,7 @@ "@vitejs/plugin-react": "^4.1.0", "jest": "^29.7.0", "typescript": "^5.2.2", - "vite": "^4.5.3" + "vite": "^4.5.5" } }, "node_modules/@ampproject/remapping": { @@ -6213,9 +6213,9 @@ "dev": true }, "node_modules/vite": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", - "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", "dev": true, "dependencies": { "esbuild": "^0.18.10", diff --git a/docker-extension/ui/package.json b/docker-extension/ui/package.json index 4a8f9766..bbc7907e 100644 --- a/docker-extension/ui/package.json +++ b/docker-extension/ui/package.json @@ -28,6 +28,6 @@ "@vitejs/plugin-react": "^4.1.0", "jest": "^29.7.0", "typescript": "^5.2.2", - "vite": "^4.5.3" + "vite": "^4.5.5" } } From bfd4c9686cccdac5c3fda60ff56f6ca5aaa38736 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 09:50:18 +1000 Subject: [PATCH 18/41] Should pass across imageVersions to educates component. --- .../_ytt_lib/infrastructure/custom/educates.lib.yaml | 2 ++ client-programs/pkg/cmd/admin_platform_config_cmd.go | 11 +++++------ client-programs/pkg/cmd/admin_platform_deploy_cmd.go | 11 +++++------ client-programs/pkg/installer/installer.go | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml index 88369b4f..c05cdee7 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml @@ -182,4 +182,6 @@ imageRegistry: host: #@ data.values.imageRegistry.host #@ if/end hasattr(data.values, "version") and data.values.version != None: version: #@ data.values.version +#@ if/end hasattr(data.values, "imageVersions") and data.values.imageVersions != None: +imageVersions: #@ data.values.imageVersions #@ end diff --git a/client-programs/pkg/cmd/admin_platform_config_cmd.go b/client-programs/pkg/cmd/admin_platform_config_cmd.go index 3676cf12..25c6c5cc 100644 --- a/client-programs/pkg/cmd/admin_platform_config_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_config_cmd.go @@ -2,7 +2,6 @@ package cmd import ( "fmt" - "strings" "github.com/spf13/cobra" @@ -58,16 +57,16 @@ func (o *PlatformConfigOptions) Run() error { return err } - fullConfig.Version = o.Version + // fullConfig.Version = o.Version // Set image registry host and namespace by splitting the package // repository into host and namespace. That is split on the first '/'. - imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] - imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] + // imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] + // imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] - fullConfig.ImageRegistry.Host = imageRepositoryHost - fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace + // fullConfig.ImageRegistry.Host = imageRepositoryHost + // fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace config.PrintConfigToStdout(fullConfig) } diff --git a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go index 0d2b0e23..97e2c976 100644 --- a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go @@ -2,7 +2,6 @@ package cmd import ( "fmt" - "strings" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -73,16 +72,16 @@ func (o *PlatformDeployOptions) Run() error { return err } - fullConfig.Version = o.Version + // fullConfig.Version = o.Version // Set image registry host and namespace by splitting the package // repository into host and namespace. That is split on the first '/'. - imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] - imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] + // imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] + // imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] - fullConfig.ImageRegistry.Host = imageRepositoryHost - fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace + // fullConfig.ImageRegistry.Host = imageRepositoryHost + // fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace if o.DryRun { if err = installer.DryRun(o.Version, o.PackageRepository, fullConfig, o.Verbose, false, o.skipImageResolution); err != nil { diff --git a/client-programs/pkg/installer/installer.go b/client-programs/pkg/installer/installer.go index 3bd79588..9dd89688 100644 --- a/client-programs/pkg/installer/installer.go +++ b/client-programs/pkg/installer/installer.go @@ -269,12 +269,12 @@ func (inst *Installer) template(tempDir string, inputDir string, fullConfig *con kbldFiles := []*files.File{} // TODO: Revisit when this needs to be used - if !skipImageResolution { - kbldFiles, err = files.NewSortedFilesFromPaths([]string{filepath.Join(inputDir, "kbld/kbld-images.yaml")}, files.SymlinkAllowOpts{}) - if err != nil { - return "", err - } + // if !skipImageResolution { + kbldFiles, err = files.NewSortedFilesFromPaths([]string{filepath.Join(inputDir, "kbld/kbld-images.yaml")}, files.SymlinkAllowOpts{}) + if err != nil { + return "", err } + // } opts.DataValuesFlags = cmdtpl.DataValuesFlags{ FromFiles: []string{"values", "images"}, From 064e13ff264347abbc9926eccd517dcea4eb52f7 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 10:50:00 +1000 Subject: [PATCH 19/41] Revert code to forcibly add CLI builtin defaults. --- client-programs/pkg/cmd/admin_platform_config_cmd.go | 11 ----------- client-programs/pkg/cmd/admin_platform_deploy_cmd.go | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/client-programs/pkg/cmd/admin_platform_config_cmd.go b/client-programs/pkg/cmd/admin_platform_config_cmd.go index 25c6c5cc..44839281 100644 --- a/client-programs/pkg/cmd/admin_platform_config_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_config_cmd.go @@ -57,17 +57,6 @@ func (o *PlatformConfigOptions) Run() error { return err } - // fullConfig.Version = o.Version - - // Set image registry host and namespace by splitting the package - // repository into host and namespace. That is split on the first '/'. - - // imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] - // imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] - - // fullConfig.ImageRegistry.Host = imageRepositoryHost - // fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace - config.PrintConfigToStdout(fullConfig) } diff --git a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go index 97e2c976..a573b2d5 100644 --- a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go +++ b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go @@ -72,17 +72,6 @@ func (o *PlatformDeployOptions) Run() error { return err } - // fullConfig.Version = o.Version - - // Set image registry host and namespace by splitting the package - // repository into host and namespace. That is split on the first '/'. - - // imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0] - // imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1] - - // fullConfig.ImageRegistry.Host = imageRepositoryHost - // fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace - if o.DryRun { if err = installer.DryRun(o.Version, o.PackageRepository, fullConfig, o.Verbose, false, o.skipImageResolution); err != nil { return errors.Wrap(err, "educates could not be installed") From 5f1de8724ae5aa7a34c1052eba7962e29a78f636 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 11:00:00 +1000 Subject: [PATCH 20/41] Rename what values are copied for conciseness. --- .../infrastructure/custom/80-copy-educates-config.yaml | 6 +++--- .../ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml index 7c3d3b71..285e4c12 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/80-copy-educates-config.yaml @@ -1,10 +1,10 @@ #@ load("@ytt:data", "data") #@ load("@ytt:overlay", "overlay") -#@ load("educates.lib.yaml", "copy_builtin_cli_values") +#@ load("educates.lib.yaml", "copy_core_educates_values") -#! This copies only builtin CLI provides values. +#! This copies only core Educates values. #@overlay/match-child-defaults missing_ok=True clusterPackages: educates: - settings: #@ copy_builtin_cli_values() + settings: #@ copy_core_educates_values() diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml index c05cdee7..aea5992d 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml @@ -173,7 +173,7 @@ lookupService: ingressPrefix: #@ data.values.lookupService.ingressPrefix #@ end -#@ def copy_builtin_cli_values(): +#@ def copy_core_educates_values(): #@ if/end hasattr(data.values, "imageRegistry") and data.values.imageRegistry != None: imageRegistry: #@ if/end hasattr(data.values.imageRegistry, "namespace") and data.values.imageRegistry.namespace != None: From 71452c1d5c8446068fe7341809d4b20abdf0d0b0 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 11:47:33 +1000 Subject: [PATCH 21/41] Update release notes for image reference issues. --- project-docs/release-notes/version-3.0.1.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index df817a70..786a18c1 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -38,3 +38,7 @@ Bugs Fixed * If a locally managed config file had not been created using the command `educates local config edit` prior to running `educates create-cluster`, it would fail as the local config directory wasn't being created automatically. + +* Using the `custom` provider when the `educates` component was enabled, would + fail when using CLI to create or update a cluster as image references were not + being replaced with references to where released image artifacts were stored. From 17e6aecedb93fa0ebeeddcb2a7d5deee65db0c43 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 13:40:22 +1000 Subject: [PATCH 22/41] Minikube requires LoadBalancer service for Contour Envoy and not ClusterIP. --- .../bundle/config/ytt/_ytt_lib/packages/contour/rules.star | 6 +++--- project-docs/release-notes/version-3.0.1.md | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star index ddd59252..0eadac36 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star @@ -1,8 +1,8 @@ def check_infra(val): - if val["infraProvider"] in ["aws", "gcp", "azure"]: + if val["infraProvider"] in ["aws", "gcp", "azure", "minikube"]: return val["service"]["type"] == "LoadBalancer" or fail("{} infra provider requires service.type to be LoadBalancer".format(val["infraProvider"])) end - if val["infraProvider"] in ["kind", "minikube"]: + if val["infraProvider"] in ["kind"]: return val["service"]["type"] == "ClusterIP" or fail("{} infra provider requires service.type to be ClusterIP".format(val["infraProvider"])) end return True @@ -21,4 +21,4 @@ end def default_HTTP_Versions(): return ["HTTP/1.1", "HTTP/2"] -end \ No newline at end of file +end diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index 786a18c1..e0780e32 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -42,3 +42,7 @@ Bugs Fixed * Using the `custom` provider when the `educates` component was enabled, would fail when using CLI to create or update a cluster as image references were not being replaced with references to where released image artifacts were stored. + +* Internal infrastructure provider setting for when installing `contour` was + enforcing use of `ClusterIP` for Envoy service when provider specified as + `minikube` when should have required `LoadBalancer`. From 2540b93b7b202479b0bfc3f503429e5e729de094 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 13:50:32 +1000 Subject: [PATCH 23/41] Add opinionated installer configuration for Minikube. --- .../minikube/00-remove-toplevel-values.yaml | 48 +++++ .../10-default-settings-for-provider.yaml | 40 ++++ .../minikube/50-packages-enablement.yaml | 13 ++ .../minikube/80-copy-educates-config.yaml | 10 + .../minikube/99-remove-settings-disabled.yaml | 36 ++++ .../infrastructure/minikube/README.md | 4 + .../infrastructure/minikube/defaults.star | 7 + .../infrastructure/minikube/educates.lib.yaml | 173 ++++++++++++++++++ .../infrastructure/minikube/functions.star | 18 ++ .../bundle/config/ytt/values-schema.yaml | 6 +- project-docs/release-notes/version-3.0.1.md | 7 + 11 files changed, 359 insertions(+), 3 deletions(-) create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/00-remove-toplevel-values.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/80-copy-educates-config.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/99-remove-settings-disabled.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/README.md create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/defaults.star create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/educates.lib.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/functions.star diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/00-remove-toplevel-values.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/00-remove-toplevel-values.yaml new file mode 100644 index 00000000..c64d2fda --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/00-remove-toplevel-values.yaml @@ -0,0 +1,48 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") + +#@overlay/remove +debug: + +#@overlay/remove +localKindCluster: +#@overlay/remove +localDNSResolver: + +#@overlay/remove +clusterInfrastructure: + +#@overlay/remove +imageRegistry: +#@overlay/remove +version: +#@overlay/remove +imageVersions: +#@overlay/remove +clusterRuntime: +#@overlay/remove +clusterIngress: +#@overlay/remove +sessionCookies: +#@overlay/remove +clusterStorage: +#@overlay/remove +clusterSecrets: +#@overlay/remove +clusterSecurity: +#@overlay/remove +workshopSecurity: +#@overlay/remove +trainingPortal: +#@overlay/remove +dockerDaemon: +#@overlay/remove +clusterNetwork: +#@overlay/remove +workshopAnalytics: +#@overlay/remove +websiteStyling: +#@overlay/remove +imagePuller: +#@overlay/remove +lookupService: diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml new file mode 100644 index 00000000..aa8027ca --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml @@ -0,0 +1,40 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") +#@ load("functions.star", "isClusterPackageEnableByDefault") + +#! This file contains default values for the custom infrastructure provider. +#! These are the values that will be set if not overridden by the user. + +#@overlay/match-child-defaults missing_ok=True +#@overlay/replace +clusterPackages: + contour: + enabled: #@ isClusterPackageEnableByDefault("contour") + settings: + infraProvider: minikube + contour: + replicas: 1 + configFileContents: + defaultHttpVersions: + - "HTTP/1.1" + service: + type: LoadBalancer + useHostPorts: true + cert-manager: + enabled: #@ isClusterPackageEnableByDefault("cert-manager") + settings: {} + external-dns: + enabled: #@ isClusterPackageEnableByDefault("external-dns") + settings: {} + certs: + enabled: #@ isClusterPackageEnableByDefault("certs") + settings: {} + kyverno: + enabled: #@ isClusterPackageEnableByDefault("kyverno") + settings: {} + kapp-controller: + enabled: #@ isClusterPackageEnableByDefault("kapp-controller") + settings: {} + educates: + enabled: #@ isClusterPackageEnableByDefault("educates") + settings: {} diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml new file mode 100644 index 00000000..c49cb2b0 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml @@ -0,0 +1,13 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") + +#! This enables packages based on the user input + +#@overlay/match-child-defaults missing_ok=True +clusterPackages: + contour: + #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "contour") and hasattr(data.values.clusterPackages.kyverno, "contour"): + enabled: #@ data.values.clusterPackages.contour.enabled + kyverno: + #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "kyverno") and hasattr(data.values.clusterPackages.kyverno, "enabled"): + enabled: #@ data.values.clusterPackages.kyverno.enabled diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/80-copy-educates-config.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/80-copy-educates-config.yaml new file mode 100644 index 00000000..1afda1ac --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/80-copy-educates-config.yaml @@ -0,0 +1,10 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") +#@ load("educates.lib.yaml", "copy_all_educates_values") + +#! This copies user provided values for the custom infrastructure provider. + +#@overlay/match-child-defaults missing_ok=True +clusterPackages: + educates: + settings: #@ copy_all_educates_values() diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/99-remove-settings-disabled.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/99-remove-settings-disabled.yaml new file mode 100644 index 00000000..25b8297c --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/99-remove-settings-disabled.yaml @@ -0,0 +1,36 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") +#@ load("functions.star", "isClusterPackageExplicitDisabled") + +#! This removes settings for disabled packages + +#@overlay/match-child-defaults missing_ok=True +clusterPackages: + contour: + #@ if/end isClusterPackageExplicitDisabled("contour"): + #@overlay/replace + settings: {} + cert-manager: + #@ if/end isClusterPackageExplicitDisabled("cert-manager"): + #@overlay/replace + settings: {} + external-dns: + #@ if/end isClusterPackageExplicitDisabled("external-dns"): + #@overlay/replace + settings: {} + certs: + #@ if/end isClusterPackageExplicitDisabled("certs"): + #@overlay/replace + settings: {} + kyverno: + #@ if/end isClusterPackageExplicitDisabled("kyverno"): + #@overlay/replace + settings: {} + kapp-controller: + #@ if/end isClusterPackageExplicitDisabled("kapp-controller"): + #@overlay/replace + settings: {} + #! educates: + #! #@ if/end isClusterPackageExplicitDisabled("educates"): + #! #@overlay/replace + #! settings: {} diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/README.md b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/README.md new file mode 100644 index 00000000..11f2bd15 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/README.md @@ -0,0 +1,4 @@ +# minikube +By default, contour, kyverno and educates will be installed +We only allow to enabling/disabling contour and kyverno +We copy all educates main config to the clusterPackage diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/defaults.star b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/defaults.star new file mode 100644 index 00000000..b2b3d9e1 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/defaults.star @@ -0,0 +1,7 @@ +load("@ytt:data", "data") + +enabledByDefaultPackagesList = [ + "contour", + "kyverno", + "educates" +] diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/educates.lib.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/educates.lib.yaml new file mode 100644 index 00000000..b721fccf --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/educates.lib.yaml @@ -0,0 +1,173 @@ +#@ load("@ytt:data", "data") + +#@ def copy_all_educates_values(): + +#@ if/end hasattr(data.values, "imageRegistry") and data.values.imageRegistry != None: +imageRegistry: + #@ if/end hasattr(data.values.imageRegistry, "namespace") and data.values.imageRegistry.namespace != None: + namespace: #@ data.values.imageRegistry.namespace + #@ if/end hasattr(data.values.imageRegistry, "host") and data.values.imageRegistry.host != None: + host: #@ data.values.imageRegistry.host +#@ if/end hasattr(data.values, "version") and data.values.version != None: +version: #@ data.values.version +#@ if/end hasattr(data.values, "imageVersions") and data.values.imageVersions != None: +imageVersions: #@ data.values.imageVersions +#@ if/end hasattr(data.values, "clusterRuntime") and data.values.clusterRuntime != None: +clusterRuntime: #@ data.values.clusterRuntime +#@ if/end hasattr(data.values, "clusterIngress") and data.values.clusterIngress != None: +clusterIngress: + #@ if/end hasattr(data.values.clusterIngress, "domain") and data.values.clusterIngress.domain != None: + domain: #@ data.values.clusterIngress.domain + #@ if/end hasattr(data.values.clusterIngress, "class") and data.values.clusterIngress["class"] != None: + class: #@ data.values.clusterIngress["class"] + #@ if/end hasattr(data.values.clusterIngress, "protocol") and data.values.clusterIngress.protocol != None: + protocol: #@ data.values.clusterIngress.protocol + #@ if/end hasattr(data.values.clusterIngress, "tlsCertificate") and data.values.clusterIngress.tlsCertificate != None: + tlsCertificate: + #@ if/end hasattr(data.values.clusterIngress.tlsCertificate, "tls.crt") and data.values.clusterIngress.tlsCertificate["tls.crt"] != None: + tls.crt: #@ data.values.clusterIngress.tlsCertificate["tls.crt"] + #@ if/end hasattr(data.values.clusterIngress.tlsCertificate, "tls.key") and data.values.clusterIngress.tlsCertificate["tls.key"] != None: + tls.key: #@ data.values.clusterIngress.tlsCertificate["tls.key"] + #! TODO: Customize certs name reference in eks + #! projectcontour/wildcard + #@ if/end hasattr(data.values.clusterIngress, "tlsCertificateRef") and data.values.clusterIngress.tlsCertificateRef != None: + tlsCertificateRef: + namespace: #@ (hasattr(data.values.clusterIngress.tlsCertificateRef, "namespace") and data.values.clusterIngress.tlsCertificateRef.namespace != None) and data.values.clusterIngress.tlsCertificateRef.namespace or "projectcontour" + #@ if/end hasattr(data.values.clusterIngress.tlsCertificateRef, "name") and data.values.clusterIngress.tlsCertificateRef.name != None: + name: #@ data.values.clusterIngress.tlsCertificateRef.name + #@ if/end hasattr(data.values.clusterIngress, "caCertificate") and data.values.clusterIngress.caCertificate != None: + caCertificate: #@ data.values.clusterIngress.caCertificate + #@ if/end hasattr(data.values.clusterIngress, "caCertificateRef") and data.values.clusterIngress.caCertificateRef != None: + caCertificateRef: + #@ if/end hasattr(data.values.clusterIngress.caCertificateRef, "namespace") and data.values.clusterIngress.caCertificateRef.namespace != None: + namespace: #@ data.values.clusterIngress.caCertificateRef.namespace + #@ if/end hasattr(data.values.clusterIngress.caCertificateRef, "name") and data.values.clusterIngress.caCertificateRef.name != None: + name: #@ data.values.clusterIngress.caCertificateRef.name + #@ if/end hasattr(data.values.clusterIngress, "caNodeInjector") and data.values.clusterIngress.caNodeInjector != None: + caNodeInjector: #@ data.values.clusterIngress.caNodeInjector +#@ if/end hasattr(data.values, "sessionCookies") and data.values.sessionCookies != None: +sessionCookies: #@ data.values.sessionCookies +#@ if/end hasattr(data.values, "clusterStorage") and data.values.clusterStorage != None: +clusterStorage: + #@ if/end hasattr(data.values.clusterStorage, "class") and data.values.clusterStorage["class"] != None: + class: #@ data.values.clusterStorage["class"] + #@ if/end hasattr(data.values.clusterStorage, "user") and data.values.clusterStorage.user != None: + user: #@ data.values.clusterStorage.user + #@ if/end hasattr(data.values.clusterStorage, "group") and data.values.clusterStorage.group != None: + group: #@ data.values.clusterStorage.group +#@ if/end hasattr(data.values, "clusterSecrets") and data.values.clusterSecrets != None: +clusterSecrets: #@ data.values.clusterSecrets +#@ if/end hasattr(data.values, "clusterSecurity") and data.values.clusterSecurity != None: +clusterSecurity: #@ data.values.clusterSecurity +#@ if/end hasattr(data.values, "workshopSecurity") and data.values.workshopSecurity != None: +workshopSecurity: #@ data.values.workshopSecurity +#@ if/end hasattr(data.values, "trainingPortal") and data.values.trainingPortal != None: +trainingPortal: + #@ if/end hasattr(data.values.trainingPortal, "credentials") and data.values.trainingPortal.credentials != None: + credentials: + #@ if/end hasattr(data.values.trainingPortal.credentials, "admin") and data.values.trainingPortal.credentials.admin != None: + admin: + #@ if/end hasattr(data.values.trainingPortal.credentials.admin, "username") and data.values.trainingPortal.credentials.admin.username != None: + username: #@ data.values.trainingPortal.credentials.admin.username + #@ if/end hasattr(data.values.trainingPortal.credentials.admin, "password") and data.values.trainingPortal.credentials.admin.password != None: + password: #@ data.values.trainingPortal.credentials.admin.password + #@ if/end hasattr(data.values.trainingPortal.credentials, "robot") and data.values.trainingPortal.credentials.admin != None: + robot: + #@ if/end hasattr(data.values.trainingPortal.credentials.robot, "username") and data.values.trainingPortal.credentials.robot.username != None: + username: #@ data.values.trainingPortal.credentials.robot.username + #@ if/end hasattr(data.values.trainingPortal.credentials.robot, "password") and data.values.trainingPortal.credentials.robot.password != None: + password: #@ data.values.trainingPortal.credentials.robot.password + #@ if/end hasattr(data.values.trainingPortal, "clients") and data.values.trainingPortal.clients != None: + clients: + #@ if/end hasattr(data.values.trainingPortal.clients, "robot") and data.values.trainingPortal.clients.robot != None: + robot: + #@ if/end hasattr(data.values.trainingPortal.clients.robot, "id") and data.values.trainingPortal.clients.robot.id != None: + id: #@ data.values.trainingPortal.clients.robot.id + #@ if/end hasattr(data.values.trainingPortal.clients.robot, "secret") and data.values.trainingPortal.clients.robot.secret != None: + secret: #@ data.values.trainingPortal.clients.robot.secret +#@ if/end hasattr(data.values, "dockerDaemon") and data.values.dockerDaemon != None: +dockerDaemon: + #@ if/end hasattr(data.values.dockerDaemon, "networkMTU") and data.values.dockerDaemon.networkMTU != None: + networkMTU: #@ data.values.dockerDaemon.networkMTU + #@ if/end hasattr(data.values.dockerDaemon, "proxyCache") and data.values.dockerDaemon.proxyCache != None: + proxyCache: + #@ if/end hasattr(data.values.dockerDaemon.proxyCache, "remoteURL") and data.values.dockerDaemon.proxyCache.remoteURL != None: + remoteURL: #@ data.values.dockerDaemon.proxyCache.remoteURL + #@ if/end hasattr(data.values.dockerDaemon.proxyCache, "username") and data.values.dockerDaemon.proxyCache.username != None: + username: #@ data.values.dockerDaemon.proxyCache.username + #@ if/end hasattr(data.values.dockerDaemon.proxyCache, "password") and data.values.dockerDaemon.proxyCache.password != None: + password: #@ data.values.dockerDaemon.proxyCache.password +#@ if/end hasattr(data.values, "clusterNetwork") and data.values.clusterNetwork != None: +clusterNetwork: #@ data.values.clusterNetwork +#@ if/end hasattr(data.values, "workshopAnalytics") and data.values.workshopAnalytics != None: +workshopAnalytics: + #@ if/end hasattr(data.values.workshopAnalytics, "google") and data.values.workshopAnalytics.google != None: + google: + #@ if/end hasattr(data.values.workshopAnalytics.google, "trackingId") and data.values.workshopAnalytics.google.trackingId != None: + trackingId: #@ data.values.workshopAnalytics.google.trackingId + #@ if/end hasattr(data.values.workshopAnalytics, "clarity") and data.values.workshopAnalytics.clarity != None: + clarity: + #@ if/end hasattr(data.values.workshopAnalytics.clarity, "trackingId") and data.values.workshopAnalytics.clarity.trackingId != None: + trackingId: #@ data.values.workshopAnalytics.clarity.trackingId + #@ if/end hasattr(data.values.workshopAnalytics, "amplitude") and data.values.workshopAnalytics.amplitude != None: + amplitude: + #@ if/end hasattr(data.values.workshopAnalytics.amplitude, "trackingId") and data.values.workshopAnalytics.amplitude.trackingId != None: + trackingId: #@ data.values.workshopAnalytics.amplitude.trackingId + #@ if/end hasattr(data.values.workshopAnalytics, "webhook") and data.values.workshopAnalytics.webhook != None: + webhook: + #@ if/end hasattr(data.values.workshopAnalytics.webhook, "url") and data.values.workshopAnalytics.webhook.url != None: + url: #@ data.values.workshopAnalytics.webhook.url +#@ if/end hasattr(data.values, "websiteStyling") and data.values.websiteStyling != None: +websiteStyling: + #@ if/end hasattr(data.values.websiteStyling, "workshopDashboard") and data.values.websiteStyling.workshopDashboard != None: + workshopDashboard: + #@ if/end hasattr(data.values.websiteStyling.workshopDashboard, "html") and data.values.websiteStyling.workshopDashboard.html != None: + html: #@ data.values.websiteStyling.workshopDashboard.html + #@ if/end hasattr(data.values.websiteStyling.workshopDashboard, "script") and data.values.websiteStyling.workshopDashboard.script != None: + script: #@ data.values.websiteStyling.workshopDashboard.script + #@ if/end hasattr(data.values.websiteStyling.workshopDashboard, "style") and data.values.websiteStyling.workshopDashboard.style != None: + style: #@ data.values.websiteStyling.workshopDashboard.style + #@ if/end hasattr(data.values.websiteStyling, "workshopInstructions") and data.values.websiteStyling.workshopInstructions != None: + workshopInstructions: + #@ if/end hasattr(data.values.websiteStyling.workshopInstructions, "html") and data.values.websiteStyling.workshopInstructions.html != None: + html: #@ data.values.websiteStyling.workshopInstructions.html + #@ if/end hasattr(data.values.websiteStyling.workshopInstructions, "script") and data.values.websiteStyling.workshopInstructions.script != None: + script: #@ data.values.websiteStyling.workshopInstructions.script + #@ if/end hasattr(data.values.websiteStyling.workshopInstructions, "style") and data.values.websiteStyling.workshopInstructions.style != None: + style: #@ data.values.websiteStyling.workshopInstructions.style + #@ if/end hasattr(data.values.websiteStyling, "workshopStarted") and data.values.websiteStyling.workshopStarted != None: + workshopStarted: + #@ if/end hasattr(data.values.websiteStyling.workshopStarted, "html") and data.values.websiteStyling.workshopStarted.html != None: + html: #@ data.values.websiteStyling.workshopStarted.html + #@ if/end hasattr(data.values.websiteStyling, "workshopFinished") and data.values.websiteStyling.workshopFinished != None: + workshopFinished: + #@ if/end hasattr(data.values.websiteStyling.workshopFinished, "html") and data.values.websiteStyling.workshopFinished.html != None: + html: #@ data.values.websiteStyling.workshopFinished.html + #@ if/end hasattr(data.values.websiteStyling, "trainingPortal") and data.values.websiteStyling.trainingPortal != None: + trainingPortal: + #@ if/end hasattr(data.values.websiteStyling.trainingPortal, "html") and data.values.websiteStyling.trainingPortal.html != None: + html: #@ data.values.websiteStyling.trainingPortal.html + #@ if/end hasattr(data.values.websiteStyling.trainingPortal, "script") and data.values.websiteStyling.trainingPortal.script != None: + script: #@ data.values.websiteStyling.trainingPortal.script + #@ if/end hasattr(data.values.websiteStyling.trainingPortal, "style") and data.values.websiteStyling.trainingPortal.style != None: + style: #@ data.values.websiteStyling.trainingPortal.style + #@ if/end hasattr(data.values.websiteStyling, "defaultTheme") and data.values.websiteStyling.defaultTheme != None: + defaultTheme: #@ data.values.websiteStyling.defaultTheme + #@ if/end hasattr(data.values.websiteStyling, "themeDataRefs") and data.values.websiteStyling.themeDataRefs != None: + themeDataRefs: #@ data.values.websiteStyling.themeDataRefs + #@ if/end hasattr(data.values.websiteStyling, "frameAncestors") and data.values.websiteStyling.frameAncestors != None: + frameAncestors: #@ data.values.websiteStyling.frameAncestors +#@ if/end hasattr(data.values, "imagePuller") and data.values.imagePuller != None: +imagePuller: + enabled: #@ data.values.imagePuller.enabled + #@ if hasattr(data.values.imagePuller, "prePullImages") and data.values.imagePuller.prePullImages != None: + #@overlay/replace + prePullImages: #@ data.values.imagePuller.prePullImages + #@ end +#@ if/end hasattr(data.values, "lookupService") and data.values.lookupService != None: +lookupService: + #@ if/end hasattr(data.values.lookupService, "enabled") and data.values.lookupService.enabled != None: + enabled: #@ data.values.lookupService.enabled + #@ if/end hasattr(data.values.lookupService, "ingressPrefix") and data.values.lookupService.ingressPrefix != None: + ingressPrefix: #@ data.values.lookupService.ingressPrefix +#@ end diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/functions.star b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/functions.star new file mode 100644 index 00000000..6a078759 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/functions.star @@ -0,0 +1,18 @@ +load("@ytt:data", "data") +load("defaults.star", "enabledByDefaultPackagesList") + +def isClusterPackageEnableByDefault(package): + return package in enabledByDefaultPackagesList +end + +def isClusterPackageEnabled(package): + if hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, package) and hasattr(data.values.clusterPackages[package], "enabled"): + return data.values.clusterPackages[package].enabled + else: + return package in enabledByDefaultPackagesList + end +end + +def isClusterPackageExplicitDisabled(package): + return not isClusterPackageEnabled(package) +end \ No newline at end of file diff --git a/carvel-packages/installer/bundle/config/ytt/values-schema.yaml b/carvel-packages/installer/bundle/config/ytt/values-schema.yaml index 1416df17..fecc03ed 100644 --- a/carvel-packages/installer/bundle/config/ytt/values-schema.yaml +++ b/carvel-packages/installer/bundle/config/ytt/values-schema.yaml @@ -51,9 +51,9 @@ clusterPackages: #@schema/title "Cluster Infrastructure" #@schema/desc "Configuration for the cluster infrastructure" clusterInfrastructure: - #! NOT IMPLEMENTED: "azure", "gke-autopilot", "minikube" + #! NOT IMPLEMENTED: "azure", "gke-autopilot" #! TODO: Implement validators. e.g. when kind is selected, clusterIngress.domain is required. - #@schema/validation one_of=["eks", "gke", "kind", "custom", "vcluster", "generic"] + #@schema/validation one_of=["eks", "gke", "kind", "custom", "vcluster", "generic", "minikube"] provider: "custom" #@schema/nullable #@schema/validation not_null=True, when=lambda _, ctx: ctx.root["clusterInfrastructure"]["provider"] == "eks" @@ -320,4 +320,4 @@ imagePuller: lookupService: enabled: false #@schema/nullable - ingressPrefix: "educates-api" \ No newline at end of file + ingressPrefix: "educates-api" diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index e0780e32..fb82ff3a 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -8,6 +8,13 @@ For details on significant changes in future versions, including feature deprecations and removals which may necessitate updates to existing workshops, see [Upcoming changes](upcoming-changes). +New Features +------------ + +* Added opinionated installer configuration for Minikube. Will by default + install Contour as the ingress controller, but can be disabled if using the + nginx ingress controller provided by Minikube. + Features Changed ---------------- From 962c380a0d075e63d6fb031b68a0d82826084aaa Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 14:04:41 +1000 Subject: [PATCH 24/41] Allow minikube provider in CLI validation. --- client-programs/pkg/config/installationconfig.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client-programs/pkg/config/installationconfig.go b/client-programs/pkg/config/installationconfig.go index 3d7cf1c1..bab12ae5 100644 --- a/client-programs/pkg/config/installationconfig.go +++ b/client-programs/pkg/config/installationconfig.go @@ -474,9 +474,9 @@ func PrintConfigToStdout(config *InstallationConfig) error { func ValidateProvider(provider string) error { switch provider { - case "eks", "kind", "gke", "custom", "vcluster", "generic": + case "eks", "kind", "gke", "custom", "vcluster", "generic", "minikube": return nil default: - return errors.New("Invalid ClusterInsfrastructure Provider. Valid values are (eks, gke, kind, custom, vcluster, generic)") + return errors.New("Invalid ClusterInsfrastructure Provider. Valid values are (eks, gke, kind, custom, vcluster, generic, minikube)") } } From c0aae544b4f530d1478b5d6b911ccb2ab3a353d1 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 14:23:38 +1000 Subject: [PATCH 25/41] Fix contour package name reference. --- .../infrastructure/minikube/50-packages-enablement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml index c49cb2b0..e986a93b 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml @@ -6,7 +6,7 @@ #@overlay/match-child-defaults missing_ok=True clusterPackages: contour: - #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "contour") and hasattr(data.values.clusterPackages.kyverno, "contour"): + #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "contour") and hasattr(data.values.clusterPackages.contour, "contour"): enabled: #@ data.values.clusterPackages.contour.enabled kyverno: #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "kyverno") and hasattr(data.values.clusterPackages.kyverno, "enabled"): From e3a7423ccbfbc38c5ba8c5cfc0d461c44136c24b Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 19 Sep 2024 14:40:21 +1000 Subject: [PATCH 26/41] Fix enable flag reference for contour package. --- .../infrastructure/minikube/50-packages-enablement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml index e986a93b..fc2812d2 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/50-packages-enablement.yaml @@ -6,7 +6,7 @@ #@overlay/match-child-defaults missing_ok=True clusterPackages: contour: - #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "contour") and hasattr(data.values.clusterPackages.contour, "contour"): + #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "contour") and hasattr(data.values.clusterPackages.contour, "enabled"): enabled: #@ data.values.clusterPackages.contour.enabled kyverno: #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "kyverno") and hasattr(data.values.clusterPackages.kyverno, "enabled"): From 05af64956cc7f225dd0f04e6234d49a45e8c86b8 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Fri, 20 Sep 2024 10:35:44 +1000 Subject: [PATCH 27/41] Default ClusterIP for minikube bit allow LoadBalancer override. --- .../minikube/10-default-settings-for-provider.yaml | 2 +- .../bundle/config/ytt/_ytt_lib/packages/contour/rules.star | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml index aa8027ca..aefc36ff 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/minikube/10-default-settings-for-provider.yaml @@ -18,7 +18,7 @@ clusterPackages: defaultHttpVersions: - "HTTP/1.1" service: - type: LoadBalancer + type: ClusterIP useHostPorts: true cert-manager: enabled: #@ isClusterPackageEnableByDefault("cert-manager") diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star index 0eadac36..13fb4417 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/packages/contour/rules.star @@ -1,5 +1,8 @@ def check_infra(val): - if val["infraProvider"] in ["aws", "gcp", "azure", "minikube"]: + if val["infraProvider"] in ["minikube"]: + return val["service"]["type"] in ["ClusterIP", "LoadBalancer"] or fail("{} infra provider requires service.type to be ClusterIP or LoadBalancer".format(val["infraProvider"])) + end + if val["infraProvider"] in ["aws", "gcp", "azure"]: return val["service"]["type"] == "LoadBalancer" or fail("{} infra provider requires service.type to be LoadBalancer".format(val["infraProvider"])) end if val["infraProvider"] in ["kind"]: From e62b0d87ce7a2dbadd7d436c7cecfdc24a6d4d0c Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Fri, 20 Sep 2024 13:19:58 +1000 Subject: [PATCH 28/41] Update docs for Minikube infrastructure provider. --- .../infrastructure-providers.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/project-docs/installation-guides/infrastructure-providers.md b/project-docs/installation-guides/infrastructure-providers.md index 1e49874c..db06faa3 100644 --- a/project-docs/installation-guides/infrastructure-providers.md +++ b/project-docs/installation-guides/infrastructure-providers.md @@ -77,7 +77,22 @@ Installation is supported on a local Kubernetes cluster created using [Kind](htt The components which will be installed are the Educates training platform, Contour as the ingress controller, and Kyverno for cluster and workshop security policy enforcement. -For this case it is required that the Kind cluster be configured to [map ports 80/443](https://kind.sigs.k8s.io/docs/user/ingress/) such that the Kubernetes ingress controller is accessible via the host. +For this case it is required that the Kind cluster be configured to [map ports 80/443](https://kind.sigs.k8s.io/docs/user/ingress/) such that the Kubernetes ingress controller is accessible via the host. The wildcard ingress domain must map to the host IP. + +Note that if using the `educates create-cluster` command the Kind cluster will be created for you. + +Installation to Minikube +------------------------ + +Installation is supported on a local Kubernetes cluster created using [Minikube](https://minikube.sigs.k8s.io). This is indicated by setting `provider` to `minikube`. + +The components which will be installed are the Educates training platform, Contour as the ingress controller, and Kyverno for cluster and workshop security policy enforcement. + +If using the `docker` driver for Minikube, you will need to use the `minikube tunnel` command to expose the ingress controller and the wildcard ingress domain must map to the host IP. + +If using a driver for Minikube which exposes the cluster on it's own IP address, the wildcard ingress domain must map to the IP of the Minikube cluster. + +If you do not want to use Contour as the ingress controller, but use the Nginx ingress controller directly supported by Minikube, you can instead set `provider` to `generic`, or alternatively still use `minikube`, but disable installation of Contour. Installation to OpenShift ------------------------- From e453305fbb8b4165bd9f4f81585791f5e42f018d Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Fri, 20 Sep 2024 13:25:39 +1000 Subject: [PATCH 29/41] Remove now incorrect release note comment as change rolled back. --- project-docs/release-notes/version-3.0.1.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index fb82ff3a..5eaf9bb3 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -49,7 +49,3 @@ Bugs Fixed * Using the `custom` provider when the `educates` component was enabled, would fail when using CLI to create or update a cluster as image references were not being replaced with references to where released image artifacts were stored. - -* Internal infrastructure provider setting for when installing `contour` was - enforcing use of `ClusterIP` for Envoy service when provider specified as - `minikube` when should have required `LoadBalancer`. From 7e7a48627c848ecaa21bb1f4c9169c03c0421df6 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Fri, 20 Sep 2024 14:13:25 +1000 Subject: [PATCH 30/41] Add openshift installer configuration. --- .../openshift/00-remove-toplevel-values.yaml | 48 +++++ .../10-default-settings-for-provider.yaml | 40 ++++ .../openshift/50-packages-enablement.yaml | 10 + .../openshift/80-copy-educates-config.yaml | 10 + .../99-remove-settings-disabled.yaml | 36 ++++ .../infrastructure/openshift/README.md | 4 + .../infrastructure/openshift/defaults.star | 6 + .../openshift/educates.lib.yaml | 173 ++++++++++++++++++ .../infrastructure/openshift/functions.star | 18 ++ .../bundle/config/ytt/values-schema.yaml | 2 +- .../pkg/config/installationconfig.go | 4 +- 11 files changed, 348 insertions(+), 3 deletions(-) create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/00-remove-toplevel-values.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/50-packages-enablement.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/80-copy-educates-config.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/99-remove-settings-disabled.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/README.md create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/defaults.star create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml create mode 100644 carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/functions.star diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/00-remove-toplevel-values.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/00-remove-toplevel-values.yaml new file mode 100644 index 00000000..c64d2fda --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/00-remove-toplevel-values.yaml @@ -0,0 +1,48 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") + +#@overlay/remove +debug: + +#@overlay/remove +localKindCluster: +#@overlay/remove +localDNSResolver: + +#@overlay/remove +clusterInfrastructure: + +#@overlay/remove +imageRegistry: +#@overlay/remove +version: +#@overlay/remove +imageVersions: +#@overlay/remove +clusterRuntime: +#@overlay/remove +clusterIngress: +#@overlay/remove +sessionCookies: +#@overlay/remove +clusterStorage: +#@overlay/remove +clusterSecrets: +#@overlay/remove +clusterSecurity: +#@overlay/remove +workshopSecurity: +#@overlay/remove +trainingPortal: +#@overlay/remove +dockerDaemon: +#@overlay/remove +clusterNetwork: +#@overlay/remove +workshopAnalytics: +#@overlay/remove +websiteStyling: +#@overlay/remove +imagePuller: +#@overlay/remove +lookupService: diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml new file mode 100644 index 00000000..e8a4de7e --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml @@ -0,0 +1,40 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") +#@ load("functions.star", "isClusterPackageEnableByDefault") +#@ load("functions.star", "isClusterPackageExplicitDisabled") + +#! This file contains default values for the custom infrastructure provider. +#! These are the values that will be set if not overridden by the user. + +#@overlay/match-child-defaults missing_ok=True +#@overlay/replace +clusterPackages: + contour: + enabled: #@ isClusterPackageEnableByDefault("contour") + settings: {} + cert-manager: + enabled: #@ isClusterPackageEnableByDefault("cert-manager") + settings: {} + external-dns: + enabled: #@ isClusterPackageEnableByDefault("external-dns") + settings: {} + certs: + enabled: #@ isClusterPackageEnableByDefault("certs") + settings: {} + kyverno: + enabled: #@ isClusterPackageEnableByDefault("kyverno") + settings: {} + kapp-controller: + enabled: #@ isClusterPackageEnableByDefault("kapp-controller") + settings: {} + educates: + enabled: #@ isClusterPackageEnableByDefault("educates") + settings: + clusterSecurity: + policyEngine: security-context-constraints + workshopSecurity: + #@ if not isClusterPackageExplicitDisabled("kyverno"): + #@ if isClusterPackageEnableByDefault("kyverno"): + rulesEngine: kyverno + #@ end + #@ end diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/50-packages-enablement.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/50-packages-enablement.yaml new file mode 100644 index 00000000..8d4b7d34 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/50-packages-enablement.yaml @@ -0,0 +1,10 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") + +#! This enables packages based on the user input + +#@overlay/match-child-defaults missing_ok=True +clusterPackages: + kyverno: + #@ if/end hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, "kyverno") and hasattr(data.values.clusterPackages.kyverno, "enabled"): + enabled: #@ data.values.clusterPackages.kyverno.enabled \ No newline at end of file diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/80-copy-educates-config.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/80-copy-educates-config.yaml new file mode 100644 index 00000000..1afda1ac --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/80-copy-educates-config.yaml @@ -0,0 +1,10 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") +#@ load("educates.lib.yaml", "copy_all_educates_values") + +#! This copies user provided values for the custom infrastructure provider. + +#@overlay/match-child-defaults missing_ok=True +clusterPackages: + educates: + settings: #@ copy_all_educates_values() diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/99-remove-settings-disabled.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/99-remove-settings-disabled.yaml new file mode 100644 index 00000000..25b8297c --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/99-remove-settings-disabled.yaml @@ -0,0 +1,36 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:overlay", "overlay") +#@ load("functions.star", "isClusterPackageExplicitDisabled") + +#! This removes settings for disabled packages + +#@overlay/match-child-defaults missing_ok=True +clusterPackages: + contour: + #@ if/end isClusterPackageExplicitDisabled("contour"): + #@overlay/replace + settings: {} + cert-manager: + #@ if/end isClusterPackageExplicitDisabled("cert-manager"): + #@overlay/replace + settings: {} + external-dns: + #@ if/end isClusterPackageExplicitDisabled("external-dns"): + #@overlay/replace + settings: {} + certs: + #@ if/end isClusterPackageExplicitDisabled("certs"): + #@overlay/replace + settings: {} + kyverno: + #@ if/end isClusterPackageExplicitDisabled("kyverno"): + #@overlay/replace + settings: {} + kapp-controller: + #@ if/end isClusterPackageExplicitDisabled("kapp-controller"): + #@overlay/replace + settings: {} + #! educates: + #! #@ if/end isClusterPackageExplicitDisabled("educates"): + #! #@overlay/replace + #! settings: {} diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/README.md b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/README.md new file mode 100644 index 00000000..03738962 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/README.md @@ -0,0 +1,4 @@ +# openshift +By default, only kyverno and educates will be installed +We only allow to enabling/disabling kyverno +We copy all educates main config to the clusterPackage diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/defaults.star b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/defaults.star new file mode 100644 index 00000000..e0e22857 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/defaults.star @@ -0,0 +1,6 @@ +load("@ytt:data", "data") + +enabledByDefaultPackagesList = [ + "kyverno", + "educates" +] \ No newline at end of file diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml new file mode 100644 index 00000000..b721fccf --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml @@ -0,0 +1,173 @@ +#@ load("@ytt:data", "data") + +#@ def copy_all_educates_values(): + +#@ if/end hasattr(data.values, "imageRegistry") and data.values.imageRegistry != None: +imageRegistry: + #@ if/end hasattr(data.values.imageRegistry, "namespace") and data.values.imageRegistry.namespace != None: + namespace: #@ data.values.imageRegistry.namespace + #@ if/end hasattr(data.values.imageRegistry, "host") and data.values.imageRegistry.host != None: + host: #@ data.values.imageRegistry.host +#@ if/end hasattr(data.values, "version") and data.values.version != None: +version: #@ data.values.version +#@ if/end hasattr(data.values, "imageVersions") and data.values.imageVersions != None: +imageVersions: #@ data.values.imageVersions +#@ if/end hasattr(data.values, "clusterRuntime") and data.values.clusterRuntime != None: +clusterRuntime: #@ data.values.clusterRuntime +#@ if/end hasattr(data.values, "clusterIngress") and data.values.clusterIngress != None: +clusterIngress: + #@ if/end hasattr(data.values.clusterIngress, "domain") and data.values.clusterIngress.domain != None: + domain: #@ data.values.clusterIngress.domain + #@ if/end hasattr(data.values.clusterIngress, "class") and data.values.clusterIngress["class"] != None: + class: #@ data.values.clusterIngress["class"] + #@ if/end hasattr(data.values.clusterIngress, "protocol") and data.values.clusterIngress.protocol != None: + protocol: #@ data.values.clusterIngress.protocol + #@ if/end hasattr(data.values.clusterIngress, "tlsCertificate") and data.values.clusterIngress.tlsCertificate != None: + tlsCertificate: + #@ if/end hasattr(data.values.clusterIngress.tlsCertificate, "tls.crt") and data.values.clusterIngress.tlsCertificate["tls.crt"] != None: + tls.crt: #@ data.values.clusterIngress.tlsCertificate["tls.crt"] + #@ if/end hasattr(data.values.clusterIngress.tlsCertificate, "tls.key") and data.values.clusterIngress.tlsCertificate["tls.key"] != None: + tls.key: #@ data.values.clusterIngress.tlsCertificate["tls.key"] + #! TODO: Customize certs name reference in eks + #! projectcontour/wildcard + #@ if/end hasattr(data.values.clusterIngress, "tlsCertificateRef") and data.values.clusterIngress.tlsCertificateRef != None: + tlsCertificateRef: + namespace: #@ (hasattr(data.values.clusterIngress.tlsCertificateRef, "namespace") and data.values.clusterIngress.tlsCertificateRef.namespace != None) and data.values.clusterIngress.tlsCertificateRef.namespace or "projectcontour" + #@ if/end hasattr(data.values.clusterIngress.tlsCertificateRef, "name") and data.values.clusterIngress.tlsCertificateRef.name != None: + name: #@ data.values.clusterIngress.tlsCertificateRef.name + #@ if/end hasattr(data.values.clusterIngress, "caCertificate") and data.values.clusterIngress.caCertificate != None: + caCertificate: #@ data.values.clusterIngress.caCertificate + #@ if/end hasattr(data.values.clusterIngress, "caCertificateRef") and data.values.clusterIngress.caCertificateRef != None: + caCertificateRef: + #@ if/end hasattr(data.values.clusterIngress.caCertificateRef, "namespace") and data.values.clusterIngress.caCertificateRef.namespace != None: + namespace: #@ data.values.clusterIngress.caCertificateRef.namespace + #@ if/end hasattr(data.values.clusterIngress.caCertificateRef, "name") and data.values.clusterIngress.caCertificateRef.name != None: + name: #@ data.values.clusterIngress.caCertificateRef.name + #@ if/end hasattr(data.values.clusterIngress, "caNodeInjector") and data.values.clusterIngress.caNodeInjector != None: + caNodeInjector: #@ data.values.clusterIngress.caNodeInjector +#@ if/end hasattr(data.values, "sessionCookies") and data.values.sessionCookies != None: +sessionCookies: #@ data.values.sessionCookies +#@ if/end hasattr(data.values, "clusterStorage") and data.values.clusterStorage != None: +clusterStorage: + #@ if/end hasattr(data.values.clusterStorage, "class") and data.values.clusterStorage["class"] != None: + class: #@ data.values.clusterStorage["class"] + #@ if/end hasattr(data.values.clusterStorage, "user") and data.values.clusterStorage.user != None: + user: #@ data.values.clusterStorage.user + #@ if/end hasattr(data.values.clusterStorage, "group") and data.values.clusterStorage.group != None: + group: #@ data.values.clusterStorage.group +#@ if/end hasattr(data.values, "clusterSecrets") and data.values.clusterSecrets != None: +clusterSecrets: #@ data.values.clusterSecrets +#@ if/end hasattr(data.values, "clusterSecurity") and data.values.clusterSecurity != None: +clusterSecurity: #@ data.values.clusterSecurity +#@ if/end hasattr(data.values, "workshopSecurity") and data.values.workshopSecurity != None: +workshopSecurity: #@ data.values.workshopSecurity +#@ if/end hasattr(data.values, "trainingPortal") and data.values.trainingPortal != None: +trainingPortal: + #@ if/end hasattr(data.values.trainingPortal, "credentials") and data.values.trainingPortal.credentials != None: + credentials: + #@ if/end hasattr(data.values.trainingPortal.credentials, "admin") and data.values.trainingPortal.credentials.admin != None: + admin: + #@ if/end hasattr(data.values.trainingPortal.credentials.admin, "username") and data.values.trainingPortal.credentials.admin.username != None: + username: #@ data.values.trainingPortal.credentials.admin.username + #@ if/end hasattr(data.values.trainingPortal.credentials.admin, "password") and data.values.trainingPortal.credentials.admin.password != None: + password: #@ data.values.trainingPortal.credentials.admin.password + #@ if/end hasattr(data.values.trainingPortal.credentials, "robot") and data.values.trainingPortal.credentials.admin != None: + robot: + #@ if/end hasattr(data.values.trainingPortal.credentials.robot, "username") and data.values.trainingPortal.credentials.robot.username != None: + username: #@ data.values.trainingPortal.credentials.robot.username + #@ if/end hasattr(data.values.trainingPortal.credentials.robot, "password") and data.values.trainingPortal.credentials.robot.password != None: + password: #@ data.values.trainingPortal.credentials.robot.password + #@ if/end hasattr(data.values.trainingPortal, "clients") and data.values.trainingPortal.clients != None: + clients: + #@ if/end hasattr(data.values.trainingPortal.clients, "robot") and data.values.trainingPortal.clients.robot != None: + robot: + #@ if/end hasattr(data.values.trainingPortal.clients.robot, "id") and data.values.trainingPortal.clients.robot.id != None: + id: #@ data.values.trainingPortal.clients.robot.id + #@ if/end hasattr(data.values.trainingPortal.clients.robot, "secret") and data.values.trainingPortal.clients.robot.secret != None: + secret: #@ data.values.trainingPortal.clients.robot.secret +#@ if/end hasattr(data.values, "dockerDaemon") and data.values.dockerDaemon != None: +dockerDaemon: + #@ if/end hasattr(data.values.dockerDaemon, "networkMTU") and data.values.dockerDaemon.networkMTU != None: + networkMTU: #@ data.values.dockerDaemon.networkMTU + #@ if/end hasattr(data.values.dockerDaemon, "proxyCache") and data.values.dockerDaemon.proxyCache != None: + proxyCache: + #@ if/end hasattr(data.values.dockerDaemon.proxyCache, "remoteURL") and data.values.dockerDaemon.proxyCache.remoteURL != None: + remoteURL: #@ data.values.dockerDaemon.proxyCache.remoteURL + #@ if/end hasattr(data.values.dockerDaemon.proxyCache, "username") and data.values.dockerDaemon.proxyCache.username != None: + username: #@ data.values.dockerDaemon.proxyCache.username + #@ if/end hasattr(data.values.dockerDaemon.proxyCache, "password") and data.values.dockerDaemon.proxyCache.password != None: + password: #@ data.values.dockerDaemon.proxyCache.password +#@ if/end hasattr(data.values, "clusterNetwork") and data.values.clusterNetwork != None: +clusterNetwork: #@ data.values.clusterNetwork +#@ if/end hasattr(data.values, "workshopAnalytics") and data.values.workshopAnalytics != None: +workshopAnalytics: + #@ if/end hasattr(data.values.workshopAnalytics, "google") and data.values.workshopAnalytics.google != None: + google: + #@ if/end hasattr(data.values.workshopAnalytics.google, "trackingId") and data.values.workshopAnalytics.google.trackingId != None: + trackingId: #@ data.values.workshopAnalytics.google.trackingId + #@ if/end hasattr(data.values.workshopAnalytics, "clarity") and data.values.workshopAnalytics.clarity != None: + clarity: + #@ if/end hasattr(data.values.workshopAnalytics.clarity, "trackingId") and data.values.workshopAnalytics.clarity.trackingId != None: + trackingId: #@ data.values.workshopAnalytics.clarity.trackingId + #@ if/end hasattr(data.values.workshopAnalytics, "amplitude") and data.values.workshopAnalytics.amplitude != None: + amplitude: + #@ if/end hasattr(data.values.workshopAnalytics.amplitude, "trackingId") and data.values.workshopAnalytics.amplitude.trackingId != None: + trackingId: #@ data.values.workshopAnalytics.amplitude.trackingId + #@ if/end hasattr(data.values.workshopAnalytics, "webhook") and data.values.workshopAnalytics.webhook != None: + webhook: + #@ if/end hasattr(data.values.workshopAnalytics.webhook, "url") and data.values.workshopAnalytics.webhook.url != None: + url: #@ data.values.workshopAnalytics.webhook.url +#@ if/end hasattr(data.values, "websiteStyling") and data.values.websiteStyling != None: +websiteStyling: + #@ if/end hasattr(data.values.websiteStyling, "workshopDashboard") and data.values.websiteStyling.workshopDashboard != None: + workshopDashboard: + #@ if/end hasattr(data.values.websiteStyling.workshopDashboard, "html") and data.values.websiteStyling.workshopDashboard.html != None: + html: #@ data.values.websiteStyling.workshopDashboard.html + #@ if/end hasattr(data.values.websiteStyling.workshopDashboard, "script") and data.values.websiteStyling.workshopDashboard.script != None: + script: #@ data.values.websiteStyling.workshopDashboard.script + #@ if/end hasattr(data.values.websiteStyling.workshopDashboard, "style") and data.values.websiteStyling.workshopDashboard.style != None: + style: #@ data.values.websiteStyling.workshopDashboard.style + #@ if/end hasattr(data.values.websiteStyling, "workshopInstructions") and data.values.websiteStyling.workshopInstructions != None: + workshopInstructions: + #@ if/end hasattr(data.values.websiteStyling.workshopInstructions, "html") and data.values.websiteStyling.workshopInstructions.html != None: + html: #@ data.values.websiteStyling.workshopInstructions.html + #@ if/end hasattr(data.values.websiteStyling.workshopInstructions, "script") and data.values.websiteStyling.workshopInstructions.script != None: + script: #@ data.values.websiteStyling.workshopInstructions.script + #@ if/end hasattr(data.values.websiteStyling.workshopInstructions, "style") and data.values.websiteStyling.workshopInstructions.style != None: + style: #@ data.values.websiteStyling.workshopInstructions.style + #@ if/end hasattr(data.values.websiteStyling, "workshopStarted") and data.values.websiteStyling.workshopStarted != None: + workshopStarted: + #@ if/end hasattr(data.values.websiteStyling.workshopStarted, "html") and data.values.websiteStyling.workshopStarted.html != None: + html: #@ data.values.websiteStyling.workshopStarted.html + #@ if/end hasattr(data.values.websiteStyling, "workshopFinished") and data.values.websiteStyling.workshopFinished != None: + workshopFinished: + #@ if/end hasattr(data.values.websiteStyling.workshopFinished, "html") and data.values.websiteStyling.workshopFinished.html != None: + html: #@ data.values.websiteStyling.workshopFinished.html + #@ if/end hasattr(data.values.websiteStyling, "trainingPortal") and data.values.websiteStyling.trainingPortal != None: + trainingPortal: + #@ if/end hasattr(data.values.websiteStyling.trainingPortal, "html") and data.values.websiteStyling.trainingPortal.html != None: + html: #@ data.values.websiteStyling.trainingPortal.html + #@ if/end hasattr(data.values.websiteStyling.trainingPortal, "script") and data.values.websiteStyling.trainingPortal.script != None: + script: #@ data.values.websiteStyling.trainingPortal.script + #@ if/end hasattr(data.values.websiteStyling.trainingPortal, "style") and data.values.websiteStyling.trainingPortal.style != None: + style: #@ data.values.websiteStyling.trainingPortal.style + #@ if/end hasattr(data.values.websiteStyling, "defaultTheme") and data.values.websiteStyling.defaultTheme != None: + defaultTheme: #@ data.values.websiteStyling.defaultTheme + #@ if/end hasattr(data.values.websiteStyling, "themeDataRefs") and data.values.websiteStyling.themeDataRefs != None: + themeDataRefs: #@ data.values.websiteStyling.themeDataRefs + #@ if/end hasattr(data.values.websiteStyling, "frameAncestors") and data.values.websiteStyling.frameAncestors != None: + frameAncestors: #@ data.values.websiteStyling.frameAncestors +#@ if/end hasattr(data.values, "imagePuller") and data.values.imagePuller != None: +imagePuller: + enabled: #@ data.values.imagePuller.enabled + #@ if hasattr(data.values.imagePuller, "prePullImages") and data.values.imagePuller.prePullImages != None: + #@overlay/replace + prePullImages: #@ data.values.imagePuller.prePullImages + #@ end +#@ if/end hasattr(data.values, "lookupService") and data.values.lookupService != None: +lookupService: + #@ if/end hasattr(data.values.lookupService, "enabled") and data.values.lookupService.enabled != None: + enabled: #@ data.values.lookupService.enabled + #@ if/end hasattr(data.values.lookupService, "ingressPrefix") and data.values.lookupService.ingressPrefix != None: + ingressPrefix: #@ data.values.lookupService.ingressPrefix +#@ end diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/functions.star b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/functions.star new file mode 100644 index 00000000..6a078759 --- /dev/null +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/functions.star @@ -0,0 +1,18 @@ +load("@ytt:data", "data") +load("defaults.star", "enabledByDefaultPackagesList") + +def isClusterPackageEnableByDefault(package): + return package in enabledByDefaultPackagesList +end + +def isClusterPackageEnabled(package): + if hasattr(data.values, "clusterPackages") and hasattr(data.values.clusterPackages, package) and hasattr(data.values.clusterPackages[package], "enabled"): + return data.values.clusterPackages[package].enabled + else: + return package in enabledByDefaultPackagesList + end +end + +def isClusterPackageExplicitDisabled(package): + return not isClusterPackageEnabled(package) +end \ No newline at end of file diff --git a/carvel-packages/installer/bundle/config/ytt/values-schema.yaml b/carvel-packages/installer/bundle/config/ytt/values-schema.yaml index fecc03ed..c4adc802 100644 --- a/carvel-packages/installer/bundle/config/ytt/values-schema.yaml +++ b/carvel-packages/installer/bundle/config/ytt/values-schema.yaml @@ -53,7 +53,7 @@ clusterPackages: clusterInfrastructure: #! NOT IMPLEMENTED: "azure", "gke-autopilot" #! TODO: Implement validators. e.g. when kind is selected, clusterIngress.domain is required. - #@schema/validation one_of=["eks", "gke", "kind", "custom", "vcluster", "generic", "minikube"] + #@schema/validation one_of=["eks", "gke", "kind", "custom", "vcluster", "generic", "minikube", "openshift"] provider: "custom" #@schema/nullable #@schema/validation not_null=True, when=lambda _, ctx: ctx.root["clusterInfrastructure"]["provider"] == "eks" diff --git a/client-programs/pkg/config/installationconfig.go b/client-programs/pkg/config/installationconfig.go index bab12ae5..fc66b4ca 100644 --- a/client-programs/pkg/config/installationconfig.go +++ b/client-programs/pkg/config/installationconfig.go @@ -474,9 +474,9 @@ func PrintConfigToStdout(config *InstallationConfig) error { func ValidateProvider(provider string) error { switch provider { - case "eks", "kind", "gke", "custom", "vcluster", "generic", "minikube": + case "eks", "kind", "gke", "custom", "vcluster", "generic", "minikube", "openshift": return nil default: - return errors.New("Invalid ClusterInsfrastructure Provider. Valid values are (eks, gke, kind, custom, vcluster, generic, minikube)") + return errors.New("Invalid ClusterInsfrastructure Provider. Valid values are (eks, gke, kind, custom, vcluster, generic, minikube, openshift)") } } From 50c063512b9da58692466725e26e3536dc1dc810 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Fri, 20 Sep 2024 17:09:51 +1000 Subject: [PATCH 31/41] Don't allow cluster security policy engine to be overridden. --- .../ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml index b721fccf..8979d592 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/educates.lib.yaml @@ -57,8 +57,9 @@ clusterStorage: group: #@ data.values.clusterStorage.group #@ if/end hasattr(data.values, "clusterSecrets") and data.values.clusterSecrets != None: clusterSecrets: #@ data.values.clusterSecrets -#@ if/end hasattr(data.values, "clusterSecurity") and data.values.clusterSecurity != None: -clusterSecurity: #@ data.values.clusterSecurity +#! Should not allow cluster security policy engine default to be overridden as must be set to security-context-constraints +#! #@ if/end hasattr(data.values, "clusterSecurity") and data.values.clusterSecurity != None: +#! clusterSecurity: #@ data.values.clusterSecurity #@ if/end hasattr(data.values, "workshopSecurity") and data.values.workshopSecurity != None: workshopSecurity: #@ data.values.workshopSecurity #@ if/end hasattr(data.values, "trainingPortal") and data.values.trainingPortal != None: From 62c3e842cac03adc262eb26edd520b1445efd141 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Fri, 20 Sep 2024 19:35:46 +1000 Subject: [PATCH 32/41] Allow top level defaults to set rules engine. --- .../openshift/10-default-settings-for-provider.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml index e8a4de7e..ace3616f 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/openshift/10-default-settings-for-provider.yaml @@ -32,9 +32,3 @@ clusterPackages: settings: clusterSecurity: policyEngine: security-context-constraints - workshopSecurity: - #@ if not isClusterPackageExplicitDisabled("kyverno"): - #@ if isClusterPackageEnableByDefault("kyverno"): - rulesEngine: kyverno - #@ end - #@ end From fe4da80e8250341bb31872abf26b90d46045cfe5 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Sat, 21 Sep 2024 14:27:59 +1000 Subject: [PATCH 33/41] Update docs on OpenShift installer configuration. --- .../infrastructure-providers.md | 48 ++----------------- project-docs/release-notes/version-3.0.1.md | 4 ++ 2 files changed, 7 insertions(+), 45 deletions(-) diff --git a/project-docs/installation-guides/infrastructure-providers.md b/project-docs/installation-guides/infrastructure-providers.md index db06faa3..d65ab4ef 100644 --- a/project-docs/installation-guides/infrastructure-providers.md +++ b/project-docs/installation-guides/infrastructure-providers.md @@ -97,53 +97,11 @@ If you do not want to use Contour as the ingress controller, but use the Nginx i Installation to OpenShift ------------------------- -We are not currently providing a pre-canned configuration for installing Educates in OpenShift. We are working on including configuration for OpenShift, but believe the following configuration should work in the interim. +Installation is supported on a local Kubernetes cluster created using [OpenShift](https://docs.openshift.com). This is indicated by setting `provider` to `openshift`. -```yaml -# Specify the infrastructure provider hosting the Kubernetes cluster. -# We are using "custom" and providing the configuration ourselves. - -clusterInfrastructure: - provider: custom - -# Specify the ingress domain to be used to access the workshops hosted by -# the Educates installation. - -clusterIngress: - domain: educates-local-dev.test - -# Specify component packages to be installed for this configuration. - -clusterPackages: - # Disable installation of Contour as using OpenShift standard ingress - # controller. - - contour: - enabled: false - - # Enable installation of Kyverno for workshop security policy enforcement. - - kyverno: - enabled: true - - # Ensure that Educates training platform is installed. - - educates: - enabled: true - -# Configure cluster security policy enforcement to be done using OpenShift -# security context constraints. - -clusterSecurity: - policyEngine: security-context-constraints - -# Configure workshop security policy enforcement to be done using Kyverno. - -workshopSecurity: - rulesEngine: kyverno -``` +The components which will be installed are the Educates training platform, and Kyverno for workshop security policy enforcement. -The standard OpenShift ingress controller will be used. +OpenShift security context constraints (SCC) will be used for cluster security policies. For ingress, the native OpenShift ingress controller will be used. Installation to a vCluster -------------------------- diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index 5eaf9bb3..80b8ff3f 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -15,6 +15,10 @@ New Features install Contour as the ingress controller, but can be disabled if using the nginx ingress controller provided by Minikube. +* Added opinionated installer configuration for OpenShift. Will use the native + OpenShift ingress controller. Will force use of security context constraints + (SCC) for cluster security policy engine. + Features Changed ---------------- From 89dfa42efaee67bf4af79f105afeed2e24cacca9 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Sat, 21 Sep 2024 14:31:59 +1000 Subject: [PATCH 34/41] Add new providers to supported list. --- project-docs/installation-guides/installation-instructions.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project-docs/installation-guides/installation-instructions.md b/project-docs/installation-guides/installation-instructions.md index dd1bad9e..7ded3d79 100644 --- a/project-docs/installation-guides/installation-instructions.md +++ b/project-docs/installation-guides/installation-instructions.md @@ -27,6 +27,8 @@ Support is currently provided for the following infrastructure providers. * `eks` - Amazon Elastic Kubernetes Service (EKS) * `gke` - Google Kubernetes Engine (GKE) * `kind` - Kubernetes in Docker (Kind) +* `minikube` - Minikube +* `openshift` - OpenShift (RedHat) * `vcluster` - Virtual Kubernetes Cluster (Loft) Although using a pre-canned configuration, you can still provide customizations on top to modify what is installed and how. From b59bf72f4756df72e298f59c2e5e32eeee1c83dd Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 26 Sep 2024 19:05:25 +1000 Subject: [PATCH 35/41] Redirection should only be done when an ingress secret is supplied. --- project-docs/release-notes/version-3.0.1.md | 7 +++++++ session-manager/handlers/trainingportal.py | 2 +- session-manager/handlers/workshopenvironment.py | 4 ++-- session-manager/handlers/workshopsession.py | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/project-docs/release-notes/version-3.0.1.md b/project-docs/release-notes/version-3.0.1.md index 80b8ff3f..d0634b7f 100644 --- a/project-docs/release-notes/version-3.0.1.md +++ b/project-docs/release-notes/version-3.0.1.md @@ -53,3 +53,10 @@ Bugs Fixed * Using the `custom` provider when the `educates` component was enabled, would fail when using CLI to create or update a cluster as image references were not being replaced with references to where released image artifacts were stored. + +* When an ingress secret was not being supplied, but `clusterIngress.protocol` + was being forcibly set to `https` due to HTTPS connections being terminated by + a front end router, annotations were wrongly being added to ingresses to force + redirection from `http` to `https`. This would result in a redirect loop. + Annotations should not have been added and redirection from `http` to `https` + should instead have been done by the front end router. diff --git a/session-manager/handlers/trainingportal.py b/session-manager/handlers/trainingportal.py index 3186ec2b..ef9adf64 100644 --- a/session-manager/handlers/trainingportal.py +++ b/session-manager/handlers/trainingportal.py @@ -913,7 +913,7 @@ def training_portal_create(name, uid, body, spec, status, patch, runtime, retry, "kubernetes.io/ingress.class" ] = INGRESS_CLASS - if INGRESS_PROTOCOL == "https": + if INGRESS_SECRET: ingress_body["metadata"]["annotations"].update( { "ingress.kubernetes.io/force-ssl-redirect": "true", diff --git a/session-manager/handlers/workshopenvironment.py b/session-manager/handlers/workshopenvironment.py index 133448c0..433cd294 100644 --- a/session-manager/handlers/workshopenvironment.py +++ b/session-manager/handlers/workshopenvironment.py @@ -1632,7 +1632,7 @@ def workshop_environment_create( }, } - if INGRESS_PROTOCOL == "https": + if INGRESS_SECRET: artifacts_ingress_body["metadata"]["annotations"].update( { "ingress.kubernetes.io/force-ssl-redirect": "true", @@ -1973,7 +1973,7 @@ def workshop_environment_create( }, } - if INGRESS_PROTOCOL == "https": + if INGRESS_SECRET: assets_server_ingress_body["metadata"]["annotations"].update( { "ingress.kubernetes.io/force-ssl-redirect": "true", diff --git a/session-manager/handlers/workshopsession.py b/session-manager/handlers/workshopsession.py index 843c2437..279b7f8f 100644 --- a/session-manager/handlers/workshopsession.py +++ b/session-manager/handlers/workshopsession.py @@ -2846,7 +2846,7 @@ def _apply_environment_patch(patch): }, } - if INGRESS_PROTOCOL == "https": + if INGRESS_SECRET: registry_ingress_body["metadata"]["annotations"].update( { "ingress.kubernetes.io/force-ssl-redirect": "true", @@ -3120,7 +3120,7 @@ def _apply_environment_patch(patch): }, } - if INGRESS_PROTOCOL == "https": + if INGRESS_SECRET: ingress_body["metadata"]["annotations"].update( { "ingress.kubernetes.io/force-ssl-redirect": "true", From bb0b510deb8fabd67076ef9424599c3f804f7e27 Mon Sep 17 00:00:00 2001 From: Jorge Morales Pou Date: Thu, 26 Sep 2024 17:07:36 +0200 Subject: [PATCH 36/41] Sync external-dns hostedzone record changes --- .../infrastructure/eks/10-default-settings-for-provider.yaml | 3 ++- .../infrastructure/gke/10-default-settings-for-provider.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/eks/10-default-settings-for-provider.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/eks/10-default-settings-for-provider.yaml index 81adfc85..7a5cba98 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/eks/10-default-settings-for-provider.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/eks/10-default-settings-for-provider.yaml @@ -49,7 +49,8 @@ clusterPackages: aws: args: domain_filter: #@ data.values.clusterInfrastructure.aws.route53.hostedZone if hasattr(data.values.clusterInfrastructure.aws.route53, "hostedZone") else data.values.clusterIngress.domain - txt_owner_id: "educates" + txt_owner_id: #@ data.values.clusterIngress.domain + policy: sync certs: enabled: #@ isClusterPackageEnableByDefault("certs") settings: diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/gke/10-default-settings-for-provider.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/gke/10-default-settings-for-provider.yaml index d71e02bd..819bee1c 100644 --- a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/gke/10-default-settings-for-provider.yaml +++ b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/gke/10-default-settings-for-provider.yaml @@ -49,7 +49,8 @@ clusterPackages: args: project: #@ data.values.clusterInfrastructure.gcp.project domain_filter: #@ data.values.clusterInfrastructure.gcp.cloudDNS.zone if hasattr(data.values.clusterInfrastructure.gcp.cloudDNS, "zone") else data.values.clusterIngress.domain - txt_owner_id: "educates" + txt_owner_id: #@ data.values.clusterIngress.domain + policy: sync certs: enabled: #@ isClusterPackageEnableByDefault("certs") settings: From 5663563903217fe76cea4f3e38c41eeda58cf64a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 18:54:10 +0000 Subject: [PATCH 37/41] Bump rollup from 3.29.4 to 3.29.5 in /docker-extension/ui Bumps [rollup](https://github.com/rollup/rollup) from 3.29.4 to 3.29.5. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v3.29.4...v3.29.5) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] --- docker-extension/ui/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-extension/ui/package-lock.json b/docker-extension/ui/package-lock.json index 7cf60f55..190ab834 100644 --- a/docker-extension/ui/package-lock.json +++ b/docker-extension/ui/package-lock.json @@ -5849,9 +5849,9 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "dev": true, "bin": { "rollup": "dist/bin/rollup" From 90f9ee9b0f5a564c9820e4a148c7670279260682 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 21:29:19 +0000 Subject: [PATCH 38/41] Bump django from 4.2.15 to 4.2.16 in /training-portal Bumps [django](https://github.com/django/django) from 4.2.15 to 4.2.16. - [Commits](https://github.com/django/django/compare/4.2.15...4.2.16) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- training-portal/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/training-portal/requirements.txt b/training-portal/requirements.txt index d1251077..fced0dd4 100644 --- a/training-portal/requirements.txt +++ b/training-portal/requirements.txt @@ -1,5 +1,5 @@ mod_wsgi==5.0.0 -Django==4.2.15 +Django==4.2.16 django-registration==3.4 django-crispy-forms==2.1 crispy-bootstrap5==2023.10 From efe13aad8ed2efeca855c028c4873a6dd1ad6cb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 03:17:04 +0000 Subject: [PATCH 39/41] Bump cookie and express in /workshop-images/base-environment/opt/helper Bumps [cookie](https://github.com/jshttp/cookie) to 0.7.1 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `cookie` from 0.6.0 to 0.7.1 - [Release notes](https://github.com/jshttp/cookie/releases) - [Commits](https://github.com/jshttp/cookie/compare/v0.6.0...v0.7.1) Updates `express` from 4.21.0 to 4.21.1 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.0...4.21.1) --- updated-dependencies: - dependency-name: cookie dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../opt/helper/package-lock.json | 30 +++++++++---------- .../base-environment/opt/helper/package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/workshop-images/base-environment/opt/helper/package-lock.json b/workshop-images/base-environment/opt/helper/package-lock.json index 23fd453d..76c3de49 100644 --- a/workshop-images/base-environment/opt/helper/package-lock.json +++ b/workshop-images/base-environment/opt/helper/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.1", "dependencies": { "ansi-regex": ">=6.0.1", - "express": "^4.21.0", + "express": "^4.21.1", "minimist": ">=1.2.7", "regexp-match-indices": "^1.0.2", "yaml": "^1.10.2" @@ -1085,9 +1085,9 @@ } }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -1682,16 +1682,16 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -5046,9 +5046,9 @@ "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==" }, "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==" }, "cookie-signature": { "version": "1.0.6", @@ -5469,16 +5469,16 @@ "optional": true }, "express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", diff --git a/workshop-images/base-environment/opt/helper/package.json b/workshop-images/base-environment/opt/helper/package.json index e8427ba0..5da2840e 100644 --- a/workshop-images/base-environment/opt/helper/package.json +++ b/workshop-images/base-environment/opt/helper/package.json @@ -27,7 +27,7 @@ "watch": "tsc -watch -p ./" }, "dependencies": { - "express": "^4.21.0", + "express": "^4.21.1", "regexp-match-indices": "^1.0.2", "yaml": "^1.10.2", "ansi-regex": ">=6.0.1", From 557be6b0a1ee81457db9aac0e922ad2ff7eca2e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 03:17:09 +0000 Subject: [PATCH 40/41] Bump cookie, express and express-session Bumps [cookie](https://github.com/jshttp/cookie) to 0.7.1 and updates ancestor dependencies [cookie](https://github.com/jshttp/cookie), [express](https://github.com/expressjs/express) and [express-session](https://github.com/expressjs/session). These dependencies need to be updated together. Updates `cookie` from 0.6.0 to 0.7.1 - [Release notes](https://github.com/jshttp/cookie/releases) - [Commits](https://github.com/jshttp/cookie/compare/v0.6.0...v0.7.1) Updates `express` from 4.21.0 to 4.21.1 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.0...4.21.1) Updates `express-session` from 1.17.3 to 1.18.1 - [Release notes](https://github.com/expressjs/session/releases) - [Changelog](https://github.com/expressjs/session/blob/master/HISTORY.md) - [Commits](https://github.com/expressjs/session/compare/v1.17.3...v1.18.1) --- updated-dependencies: - dependency-name: cookie dependency-type: indirect - dependency-name: express dependency-type: direct:production - dependency-name: express-session dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../opt/gateway/package-lock.json | 74 +++++++++++-------- .../base-environment/opt/gateway/package.json | 4 +- 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/workshop-images/base-environment/opt/gateway/package-lock.json b/workshop-images/base-environment/opt/gateway/package-lock.json index d402e7db..d9ef98a2 100644 --- a/workshop-images/base-environment/opt/gateway/package-lock.json +++ b/workshop-images/base-environment/opt/gateway/package-lock.json @@ -22,9 +22,9 @@ "cors": "^2.8.5", "css-element-queries": "^1.2.3", "elliptic": ">=6.5.4", - "express": "^4.21.0", + "express": "^4.21.1", "express-basic-auth": "^1.2.1", - "express-session": "^1.17.3", + "express-session": "^1.18.1", "fontfaceobserver": "^2.3.0", "glob": "^10.3.10", "http-proxy-middleware": "^2.0.6", @@ -1379,9 +1379,9 @@ "dev": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -1773,16 +1773,16 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -1822,12 +1822,12 @@ } }, "node_modules/express-session": { - "version": "1.17.3", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz", - "integrity": "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz", + "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==", "dependencies": { - "cookie": "0.4.2", - "cookie-signature": "1.0.6", + "cookie": "0.7.2", + "cookie-signature": "1.0.7", "debug": "2.6.9", "depd": "~2.0.0", "on-headers": "~1.0.2", @@ -1840,13 +1840,18 @@ } }, "node_modules/express-session/node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "engines": { "node": ">= 0.6" } }, + "node_modules/express-session/node_modules/cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==" + }, "node_modules/fast-safe-stringify": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", @@ -5691,9 +5696,9 @@ "dev": true }, "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==" }, "cookie-signature": { "version": "1.0.6", @@ -6023,16 +6028,16 @@ } }, "express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -6069,12 +6074,12 @@ } }, "express-session": { - "version": "1.17.3", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz", - "integrity": "sha512-4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz", + "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==", "requires": { - "cookie": "0.4.2", - "cookie-signature": "1.0.6", + "cookie": "0.7.2", + "cookie-signature": "1.0.7", "debug": "2.6.9", "depd": "~2.0.0", "on-headers": "~1.0.2", @@ -6084,9 +6089,14 @@ }, "dependencies": { "cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==" + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==" + }, + "cookie-signature": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==" } } }, diff --git a/workshop-images/base-environment/opt/gateway/package.json b/workshop-images/base-environment/opt/gateway/package.json index 47de728e..fc8ea886 100644 --- a/workshop-images/base-environment/opt/gateway/package.json +++ b/workshop-images/base-environment/opt/gateway/package.json @@ -24,9 +24,9 @@ "cors": "^2.8.5", "css-element-queries": "^1.2.3", "elliptic": ">=6.5.4", - "express": "^4.21.0", + "express": "^4.21.1", "express-basic-auth": "^1.2.1", - "express-session": "^1.17.3", + "express-session": "^1.18.1", "fontfaceobserver": "^2.3.0", "glob": "^10.3.10", "http-proxy-middleware": "^2.0.6", From a8c11224f7b3106ded6564ece7004b0ca7b32209 Mon Sep 17 00:00:00 2001 From: Graham Dumpleton Date: Thu, 10 Oct 2024 14:28:14 +1100 Subject: [PATCH 41/41] Updates due to CVE fixes. --- .../opt/renderer/package-lock.json | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/workshop-images/base-environment/opt/renderer/package-lock.json b/workshop-images/base-environment/opt/renderer/package-lock.json index f1c92cef..91ab88dd 100644 --- a/workshop-images/base-environment/opt/renderer/package-lock.json +++ b/workshop-images/base-environment/opt/renderer/package-lock.json @@ -15,6 +15,7 @@ "bootstrap": "^5.3.2", "cached-path-relative": ">=1.1.0", "color-string": "^1.9.1", + "elliptic": ">=6.5.7", "express": "^4.21.0", "highlight.js": "^11.9.0", "jquery": "^3.7.1", @@ -1072,9 +1073,10 @@ "dev": true }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1398,16 +1400,17 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -4377,9 +4380,9 @@ "dev": true }, "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==" + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==" }, "cookie-signature": { "version": "1.0.6", @@ -4656,16 +4659,16 @@ } }, "express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0",