Enable helm deployments from values.yaml

skkra0 · skkra0 · commit ac27491f7dec · 2026-01-11T20:46:51.000-05:00
diff --git a/backend/src/handlers/listCharts.ts b/backend/src/handlers/listCharts.ts
@@ -1,3 +1,4 @@
+import { ValidationError } from "../service/common/errors.ts";
 import { listCharts } from "../service/listCharts.ts";
 import { json, type HandlerMap } from "../types.ts";
 export const listChartsHandler: HandlerMap["listCharts"] = async (
@@ -8,6 +9,12 @@ export const listChartsHandler: HandlerMap["listCharts"] = async (
   try {
     return json(200, res, await listCharts());
   } catch (e) {
+    if (e instanceof ValidationError) {
+      return json(400, res, {
+        code: 400,
+        message: e.message,
+      });
+    }
     console.error(e);
     return json(500, res, {
       code: 500,
diff --git a/backend/src/lib/env.ts b/backend/src/lib/env.ts
@@ -152,7 +152,11 @@ const variables = {
   /**
    * The name of the project in which custom AnvilOps charts are stored.
    */
-  CHART_PROJECT_NAME: { required: false },
+  CHART_PROJECT_NAME: { required: false, defaultValue: "anvilops-chart" },
+  /**
+   * Whether to allow Helm deployments
+   */
+  ALLOW_HELM_DEPLOYMENTS: { required: false },
   /**
    * The hostname for the image registry, e.g. registry.anvil.rcac.purdue.edu
    */
diff --git a/backend/src/service/getSettings.ts b/backend/src/service/getSettings.ts
@@ -33,5 +33,6 @@ export async function getSettings() {
     faq: clusterConfig?.faq,
     storageEnabled: env.STORAGE_CLASS_NAME !== undefined,
     isRancherManaged: isRancherManaged(),
+    allowHelmDeployments: env.ALLOW_HELM_DEPLOYMENTS === "true",
   };
 }
diff --git a/backend/src/service/helper/app.ts b/backend/src/service/helper/app.ts
@@ -10,6 +10,7 @@ import {
   MAX_NAMESPACE_LEN,
   MAX_STS_NAME_LEN,
 } from "../../lib/cluster/resources.ts";
+import { env } from "../../lib/env.ts";
 import { isRFC1123 } from "../../lib/validate.ts";
 import { ValidationError } from "../../service/common/errors.ts";
 import { DeploymentConfigService } from "./deploymentConfig.ts";
@@ -135,6 +136,10 @@ export class AppService {
         app.config,
         app.type === "update" ? app.existingAppId : undefined,
       );
+    } else if (app.config.appType === "helm") {
+      if (!env.ALLOW_HELM_DEPLOYMENTS) {
+        throw new ValidationError("Helm deployments are disabled");
+      }
     }
   }
 
diff --git a/backend/src/service/listCharts.ts b/backend/src/service/listCharts.ts
@@ -2,8 +2,12 @@ import { getOrCreate } from "../lib/cache.ts";
 import { env } from "../lib/env.ts";
 import { getChart } from "../lib/helm.ts";
 import { getRepositoriesByProject } from "../lib/registry.ts";
+import { ValidationError } from "./common/errors.ts";
 
 export async function listCharts() {
+  if (!env.ALLOW_HELM_DEPLOYMENTS) {
+    throw new ValidationError("Helm deployments are disabled");
+  }
   return JSON.parse(
     await getOrCreate("charts", 60 * 60, async () =>
       JSON.stringify(await listChartsFromRegistry()),
diff --git a/charts/anvilops/templates/anvilops/anvilops-deployment.yaml b/charts/anvilops/templates/anvilops/anvilops-deployment.yaml
@@ -221,6 +221,8 @@ spec:
               value: {{ .Values.anvilops.env.harborProjectName }}
             - name: CHART_PROJECT_NAME
               value: {{ .Values.anvilops.env.harborChartRepoName }}
+            - name: ALLOW_HELM_DEPLOYMENTS
+              value: "{{ .Values.anvilops.env.allowHelmDeployments }}"
             - name: BUILDKITD_ADDRESS
               value: {{ .Values.buildkitd.address }}
             - name: FILE_BROWSER_IMAGE
diff --git a/charts/anvilops/values.yaml b/charts/anvilops/values.yaml
@@ -20,6 +20,7 @@ anvilops:
     railpackBuilderImage: registry.anvil.rcac.purdue.edu/anvilops/railpack-builder:latest
     helmDeployerImage: registry.anvil.rcac.purdue.edu/anvilops/helm-deployer:latest
     logShipperImage: registry.anvil.rcac.purdue.edu/anvilops/log-shipper:latest
+    allowHelmDeployments: false
 
   # This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   imagePullSecrets: []
diff --git a/frontend/src/components/config/AppConfigFormFields.tsx b/frontend/src/components/config/AppConfigFormFields.tsx
@@ -1,12 +1,5 @@
-import type { components } from "@/generated/openapi";
-import type { CommonFormFields, GroupFormFields } from "@/lib/form.types";
-import { Cable } from "lucide-react";
-import { useContext } from "react";
 import { useAppConfig } from "@/components/AppConfigProvider";
 import { UserContext } from "@/components/UserProvider";
-import { GitConfigFields } from "./workload/git/GitConfigFields";
-import { HelmConfigFields } from "./helm/HelmConfigFields";
-import { ImageConfigFields } from "./workload/image/ImageConfigFields";
 import { Label } from "@/components/ui/label";
 import {
   Select,
@@ -16,13 +9,20 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { ProjectConfig } from "./ProjectConfig";
-import { CommonWorkloadConfigFields } from "./workload/CommonWorkloadConfigFields";
+import type { components } from "@/generated/openapi";
 import {
   makeFunctionalWorkloadSetter,
   makeHelmSetter,
   makeImageSetter,
 } from "@/lib/form";
+import type { CommonFormFields, GroupFormFields } from "@/lib/form.types";
+import { Cable } from "lucide-react";
+import { useContext } from "react";
+import { ProjectConfig } from "./ProjectConfig";
+import { HelmConfigFields } from "./helm/HelmConfigFields";
+import { CommonWorkloadConfigFields } from "./workload/CommonWorkloadConfigFields";
+import { GitConfigFields } from "./workload/git/GitConfigFields";
+import { ImageConfigFields } from "./workload/image/ImageConfigFields";
 
 export const AppConfigFormFields = ({
   groupState,
@@ -90,7 +90,7 @@ export const AppConfigFormFields = ({
             <SelectGroup>
               <SelectItem value="git">Git Repository</SelectItem>
               <SelectItem value="image">OCI Image</SelectItem>
-              {/* <SelectItem value="helm">Helm Chart</SelectItem> */}
+              {/* appConfig.allowHelmDeployments && <SelectItem value="helm">Helm Chart</SelectItem> */}
             </SelectGroup>
           </SelectContent>
         </Select>
diff --git a/frontend/src/components/diff/AppConfigDiff.tsx b/frontend/src/components/diff/AppConfigDiff.tsx
@@ -1,22 +1,23 @@
 import { UserContext } from "@/components/UserProvider";
 import { Label } from "@/components/ui/label";
 import { SelectContent, SelectGroup, SelectItem } from "@/components/ui/select";
-import { Cable } from "lucide-react";
-import { useContext } from "react";
-import { GitConfigDiff } from "./workload/git/GitConfigDiff";
-import type { CommonFormFields } from "@/lib/form.types";
 import {
   getFormStateFromApp,
   makeFunctionalWorkloadSetter,
   makeGitSetter,
   makeHelmSetter,
   makeImageSetter,
 } from "@/lib/form";
+import type { CommonFormFields } from "@/lib/form.types";
+import { Cable } from "lucide-react";
+import { useContext } from "react";
 import type { App } from "../../pages/app/AppView";
+import { useAppConfig } from "../AppConfigProvider";
 import { DiffSelect } from "./DiffSelect";
 import { HelmConfigDiff } from "./helm/HelmConfigDiff";
-import { ImageConfigDiff } from "./workload/image/ImageConfigDiff";
 import { CommonWorkloadConfigDiff } from "./workload/CommonWorkloadConfigDiff";
+import { GitConfigDiff } from "./workload/git/GitConfigDiff";
+import { ImageConfigDiff } from "./workload/image/ImageConfigDiff";
 
 export const AppConfigDiff = ({
   orgId,
@@ -32,7 +33,7 @@ export const AppConfigDiff = ({
   disabled?: boolean;
 }) => {
   const { user } = useContext(UserContext);
-
+  const appConfig = useAppConfig();
   const selectedOrg = orgId
     ? user?.orgs?.find((it) => it.id === orgId)
     : undefined;
@@ -79,6 +80,7 @@ export const AppConfigDiff = ({
               <SelectGroup>
                 <SelectItem value="git">Git Repository</SelectItem>
                 <SelectItem value="image">OCI Image</SelectItem>
+                {/* {appConfig.allowHelmDeployments && <SelectItem value="helm">Helm Chart</SelectItem>} */}
               </SelectGroup>
             </SelectContent>
           </DiffSelect>
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
@@ -50,6 +50,8 @@ paths:
                     type: boolean
                   isRancherManaged:
                     type: boolean
+                  allowHelmDeployments:
+                    type: boolean
   /login:
     get:
       tags:
@@ -1867,6 +1869,12 @@ paths:
                       type: object
                       additionalProperties: true
                   required: [name, note, url, urlType, version]
+        "400":
+          description: Validation failed
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ApiError"
         "500":
           description: Internal server error
           content:
diff --git a/tilt/local-values.yaml b/tilt/local-values.yaml
@@ -16,6 +16,7 @@ anvilops:
     railpackBuilderImage: anvilops/railpack-builder
     helmDeployerImage: anvilops/helm-deployer
     logShipperImage: anvilops/log-shipper
+    allowHelmDeployments: true
     registryProtocol: http
   cluster:
     name: "Local"

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,6 @@ export async function getSettings() {`
`33`	`33`	`faq: clusterConfig?.faq,`
`34`	`34`	`storageEnabled: env.STORAGE_CLASS_NAME !== undefined,`
`35`	`35`	`isRancherManaged: isRancherManaged(),`
	`36`	`+ allowHelmDeployments: env.ALLOW_HELM_DEPLOYMENTS === "true",`
`36`	`37`	`};`
`37`	`38`	`}`