@red-hat-developer-hub/e2e-test-utils 2.1.18 → 2.1.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/deployment/rhdh/config/helm/value_file.yaml +8 -10
  2. package/dist/deployment/rhdh/deployment.d.ts.map +1 -1
  3. package/dist/deployment/rhdh/deployment.js +5 -7
  4. package/package.json +1 -1
package/dist/deployment/rhdh/config/helm/value_file.yaml CHANGED
@@ -1,10 +1,8 @@
1
- upstream:
2
- backstage:
3
- extraAppConfig:
4
- - configMapRef: app-config-rhdh
5
- filename: app-config-rhdh.yaml
6
- extraEnvVarsSecrets:
7
- - rhdh-secrets
8
- global:
9
- lightspeed:
10
- enabled: false
1
+ extraAppConfig:
2
+ - configMapRef: app-config-rhdh
3
+ filename: app-config-rhdh.yaml
4
+ extraEnvFrom:
5
+ - secretRef:
6
+ name: rhdh-secrets
7
+ intelligentAssistant:
8
+ enabled: false
package/dist/deployment/rhdh/deployment.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAyB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IAwB3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAM5B;IAEX;;;OAGG;YACW,iBAAiB;IAY/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAoC1B,oBAAoB;YAWpB,eAAe;YA6Df,mBAAmB;IAmCjC,OAAO,KAAK,cAAc,GAIzB;IAEK,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IAsCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}
1
+ {"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAyB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YA0CpD,eAAe;YAmBf,aAAa;IAwB3B,uDAAuD;IACvD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAM5B;IAEX;;;OAGG;YACW,iBAAiB;IAY/B;;OAEG;YACW,uBAAuB;IAgBrC;;;;;;;;OAQG;YACW,0BAA0B;YAoC1B,oBAAoB;YAWpB,eAAe;YA2Df,mBAAmB;IAmCjC,OAAO,KAAK,cAAc,GAIzB;IAEK,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,iBAAiB;YASjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IAsCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}
package/dist/deployment/rhdh/deployment.js CHANGED
@@ -155,10 +155,7 @@ export class RHDHDeployment {
155
155
  const valueFileObject = (await mergeYamlFilesIfExists(helmValuePaths));
156
156
  this._logBoxen("Value File", valueFileObject);
157
157
  // Merge dynamic plugins into the values file (including auth-specific plugins)
158
- if (!valueFileObject.global) {
159
- valueFileObject.global = {};
160
- }
161
- valueFileObject.global.dynamic = await this._buildDynamicPluginsConfig();
158
+ valueFileObject.dynamicPlugins = await this._buildDynamicPluginsConfig();
162
159
  // Set catalog index image if CATALOG_INDEX_IMAGE env var is provided.
163
160
  // The catalog index provides dynamic-plugins.default.yaml with default plugin
164
161
  // configurations and versions for the RHDH release.
@@ -166,16 +163,17 @@ export class RHDHDeployment {
166
163
  if (catalogIndexImage) {
167
164
  const [imageRef, tag] = catalogIndexImage.split(":");
168
165
  const firstSlash = imageRef.indexOf("/");
169
- valueFileObject.global.catalogIndex = {
166
+ valueFileObject.catalogIndex = {
170
167
  image: {
171
168
  registry: imageRef.substring(0, firstSlash),
172
169
  repository: imageRef.substring(firstSlash + 1),
173
170
  tag: tag || "latest",
171
+ digest: "",
174
172
  },
175
173
  };
176
174
  this._log(`Catalog index image: ${catalogIndexImage}`);
177
175
  }
178
- this._logBoxen("Dynamic Plugins", valueFileObject.global.dynamic);
176
+ this._logBoxen("Dynamic Plugins", valueFileObject.dynamicPlugins);
179
177
  // Escape {{inherit}} for Helm's Go template engine.
180
178
  // The RHDH chart uses `tpl` on dynamic plugin values, so {{inherit}} would be
181
179
  // interpreted as a Go template action. Escaping to {{ "{{inherit}}" }} produces
@@ -188,7 +186,7 @@ export class RHDHDeployment {
188
186
  await $ `
189
187
  helm upgrade redhat-developer-hub -i "${process.env.CHART_URL || CHART_URL}" --version "${chartVersion}" \
190
188
  -f "${valueFilePath}" \
191
- --set global.clusterRouterBase="${process.env.K8S_CLUSTER_ROUTER_BASE}" \
189
+ --set openshift.clusterRouterBase="${process.env.K8S_CLUSTER_ROUTER_BASE}" \
192
190
  --namespace="${this.deploymentConfig.namespace}"
193
191
  `;
194
192
  this._log(`Helm deployment completed successfully`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@red-hat-developer-hub/e2e-test-utils",
3
- "version": "2.1.18",
3
+ "version": "2.1.19",
4
4
  "description": "Test utilities for RHDH E2E tests",
5
5
  "license": "Apache-2.0",
6
6
  "repository": {