Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/lightship-9.0.3

Author: svcAPLBot

src/otomi-stack.ts

@@ -81,6 +81,7 @@ import {
   GIT_REPO_URL,
   GIT_USER,
   HELM_CHART_CATALOG,
+  HIDDEN_APPS,
   OBJ_STORAGE_APPS,
   PREINSTALLED_EXCLUDED_APPS,
   TOOLS_HOST,
@@ -136,6 +137,7 @@ const env = cleanEnv({
   TOOLS_HOST,
   VERSIONS,
   PREINSTALLED_EXCLUDED_APPS,
+  HIDDEN_APPS,
   OBJ_STORAGE_APPS,
 })
 
@@ -541,7 +543,9 @@ export default class OtomiStack {
   }
 
   filterExcludedApp(apps: App | App[]) {
-    const excludedApps = PREINSTALLED_EXCLUDED_APPS.default.apps
+    const preInstalledExcludedApps = PREINSTALLED_EXCLUDED_APPS.default.apps
+    const hiddenApps = HIDDEN_APPS.default.apps
+    const excludedApps = preInstalledExcludedApps.concat(hiddenApps)
     const settingsInfo = this.getSettingsInfo()
     if (!Array.isArray(apps)) {
       if (settingsInfo.otomi && settingsInfo.otomi.isPreInstalled && excludedApps.includes(apps.id)) {

src/validators.ts

@@ -1,4 +1,4 @@
-import { bool, CleanedEnvAccessors, cleanEnv as clean, CleanOptions, json, num, str, ValidatorSpec } from 'envalid'
+import { bool, cleanEnv as clean, CleanedEnvAccessors, CleanOptions, json, num, str, ValidatorSpec } from 'envalid'
 
 export const AUTHZ_MOCK_IS_PLATFORM_ADMIN = bool({
   desc: 'Indicate if a mocked user is a platform admin',
@@ -65,6 +65,12 @@ export const PREINSTALLED_EXCLUDED_APPS = json({
     apps: ['cert-manager', 'minio', 'kured', 'velero', 'drone', 'external-dns'],
   },
 })
+export const HIDDEN_APPS = json({
+  desc: 'Applications that are hidden from the apps page',
+  default: {
+    apps: ['falco'],
+  },
+})
 export const OBJ_STORAGE_APPS = json({
   desc: 'Applications',
   default: [