chore: update tasks, workflows, and vars (#52)

* chore: update tasks, workflows, and vars * fix: yamllint * fix: ci error with inputs bad substitution. * fix: ci error with inputs bad substitution. * fix: uds-cli error * wip: removing --set create_options in CI for testing * wip: update renovate to use common config, add package rule to exclude weird upstream image tag * wip: update renovate to use common config, add package rule to exclude weird upstream image tag * wip: update renovate to use common config, add package rule to exclude weird upstream image tag * wip: add registry-login task from common * wip: remove publish yaml and use common; fix registry task * wip: set tag for common task imports
defenseunicorns · Feb 16, 2024 · 3ce1fa2 · 3ce1fa2
1 parent 39e9969
commit 3ce1fa2
Show file tree

Hide file tree

Showing 15 changed files with 92 additions and 160 deletions.
diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml
@@ -31,4 +31,4 @@ runs:
     - name: Install UDS CLI
       shell: bash
       # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
-      run: brew install defenseunicorns/tap/uds@0.5.2
+      run: brew install defenseunicorns/tap/uds@0.9.0
diff --git a/.github/workflows/publish-package.yaml b/.github/workflows/publish-package.yaml
@@ -29,24 +29,16 @@ jobs:
           download-init-package: false
 
       - name: Login to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+        run: uds run registry-login --set REGISTRY=ghcr.io --set REGISTRY_USERNAME=dummy --set REGISTRY_PASSWORD=${{ secrets.GITHUB_TOKEN }} --set REGISTRY_RETRY_INTERVAL=90
 
       - name: Login to Registry1
-        uses: docker/login-action@v3
-        with:
-          registry: registry1.dso.mil
-          username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
-          password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
+        run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90
 
       - name: Create Package Flavor
-        run: uds run create-pkg-flavor --set FLAVOR=${{ matrix.flavor }}
+        run: uds run create-pkg --set FLAVOR=${{ matrix.flavor }}
 
       - name: Publish Zarf Package Flavor
-        run: uds run publish-pkg-flavor
+        run: uds run publish-pkg
 
       - name: Publish Zarf Skeleton
         run: zarf package publish . oci://ghcr.io/defenseunicorns/packages

diff --git a/.github/workflows/test-k3d-package.yaml b/.github/workflows/test-k3d-package.yaml
@@ -28,23 +28,19 @@ jobs:
           download-init-package: true
 
       - name: Login to Registry1
-        uses: docker/login-action@v3
-        with:
-          registry: registry1.dso.mil
-          username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
-          password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
+        run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90
 
       - name: Setup Cluster
         run: uds run setup-cluster-no-istio
 
       - name: Create Pkg Flavor
-        run: uds run create-pkg-flavor --set FLAVOR=${{ matrix.flavor }}
+        run: uds run create-pkg --set FLAVOR=${{ matrix.flavor }}
 
       - name: Deploy Pkg Flavor
-        run: uds run deploy-pkg-flavor --set CERT_MANAGER_VALUES=./.github/ci-values/values-override.yaml --set CERT_MANAGER_MANIFESTS=./examples/deploy-custom-manifests.yaml
+        run: uds run deploy-pkg --set deploy_options="--components=deploy-custom-manifests  --set CUSTOM_VALUES=./.github/ci-values/values-override.yaml --set CUSTOM_MANIFESTS=./examples/deploy-custom-manifests.yaml"
 
       - name: Remove Package from k3d cluster
-        run: uds run remove-pkg-flavor
+        run: uds run remove-pkg
 
   test-clean-install-with-istio:
     runs-on: ubuntu-latest
@@ -62,20 +58,16 @@ jobs:
           download-init-package: true
 
       - name: Login to Registry1
-        uses: docker/login-action@v3
-        with:
-          registry: registry1.dso.mil
-          username: ${{ secrets.IRON_BANK_ROBOT_USERNAME }}
-          password: ${{ secrets.IRON_BANK_ROBOT_PASSWORD }}
+        run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90
 
       - name: Setup Cluster
         run: uds run setup-cluster-istio
 
       - name: Create Pkg Flavor
-        run: uds run create-pkg-flavor --set FLAVOR=${{ matrix.flavor }}
+        run: uds run create-pkg --set FLAVOR=${{ matrix.flavor }}
 
       - name: Deploy Pkg Flavor
-        run: uds run deploy-pkg-flavor --set CERT_MANAGER_VALUES=./.github/ci-values/values-override.yaml --set CERT_MANAGER_MANIFESTS=./examples/deploy-custom-manifests.yaml --set CONFIGURE_FOR_ISTIO=true
+        run: uds run deploy-pkg --set deploy_options="--components=deploy-custom-manifests  --set CUSTOM_VALUES=./.github/ci-values/values-override.yaml --set CUSTOM_MANIFESTS=./examples/deploy-custom-manifests.yaml --set CONFIGURE_FOR_ISTIO=true"
 
       - name: Remove Package from k3d cluster
-        run: uds run remove-pkg-flavor
+        run: uds run remove-pkg
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ This package can be built as either an `upstream` or `registry1` flavor. These f
 
 | Variable | Description |
 |----------| ------------|
-| cert_manager_values | Control for adding or overriding values for either package flavor. |
-| cert_manager_manifests | Control for deploying custom Cert-Manager resources |
+| custom_values | Control for adding or overriding values for either package flavor. |
+| custom_manifests | Control for deploying custom Cert-Manager resources |
 | configure_for_istio | Control for enabling Cert-Manager to deploy within Istio service mesh |
 
 ## Quick Start
@@ -31,15 +31,15 @@ From within the repo:
 * Deploy package
     * all defaults - `zarf package deploy zarf-package-*.zst`
 
-    * with custom values - `zarf package deploy zarf-package-*.zst --set cert_manager_values=<values-file>`
+    * with custom values - `zarf package deploy zarf-package-*.zst --set custom_values=<values-file>`
 
-    * with custom manifests - `zarf package deploy zarf-package-*.zst --components=deploy-custom-manifests --set cert_manager_manifests=<manifests>`
+    * with custom manifests - `zarf package deploy zarf-package-*.zst --components=deploy-custom-manifests --set custom_manifests=<manifests>`
 
     * for use in cluster with istio - `zarf package deploy zarf-package-*.zst --set configure_for_istio=true`
 
 ## Controlling Values
 
-You can set cert-manager values via `deploy-cert-manager-values.yaml`. This file will get passed to the `CERT_MANAGER_VALUES` variable, which will populate a values file given to the `deploy-chart` component. This allows you to add to or override the default values found in [cert-manager-values.yaml](./values/cert-manager-values.yaml). It's important to keep `installCRDs: true`, unless you want to manually install them yourself via `kubectl`. _If you do want to install CRDs manually after package deploy, you will not want to deploy the optional `deploy-custom-manifests` component, because it will fail without the CRDs._
+You can set cert-manager values via `deploy-cert-manager-values.yaml`. This file will get passed to the `CUSTOM_VALUES` variable, which will populate a values file given to the `deploy-chart` component. This allows you to add to or override the default values found in [cert-manager-values.yaml](./values/cert-manager-values.yaml). It's important to keep `installCRDs: true`, unless you want to manually install them yourself via `kubectl`. _If you do want to install CRDs manually after package deploy, you will not want to deploy the optional `deploy-custom-manifests` component, because it will fail without the CRDs._
 
 You can find a list of configurable values at [artifacthub.io](https://artifacthub.io/packages/helm/cert-manager/cert-manager).
 
@@ -60,7 +60,7 @@ prometheus:
 
 ## Deploy Custom Issuers and Certificates
 
-The optional `deploy-custom-manifests` component will apply your Issuer/ClusterIssuer/Certificates manifests. This component looks for a file passed to `###ZARF_VAR_CERT_MANAGER_MANIFESTS###`. You can do this by setting `cert_manager_manifests` via zarf-config.yaml, or `--set CERT_MANAGER_MANIFESTS=<path to your file>` on package deploy, or uds-config.yaml if using uds-cli to bundle cert-manager.
+The optional `deploy-custom-manifests` component will apply your Issuer/ClusterIssuer/Certificates manifests. This component looks for a file passed to `###ZARF_VAR_CUSTOM_MANIFESTS###`. You can do this by setting `custom_manifests` via zarf-config.yaml, or `--set CUSTOM_MANIFESTS=<path to your file>` on package deploy, or uds-config.yaml if using uds-cli to bundle cert-manager.
 
 _You can of course deploy your resources manually after the fact if you want. The benefit of using this optional component is zarf will then manage the clean up for you if the cert-manager package is removed._
 

diff --git a/examples/uds-config.yaml b/examples/uds-config.yaml
@@ -7,4 +7,4 @@ bundle:
           approved_registries: "127.0.0.1* | registry1.dso.mil | ghcr.io"
       cert-manager:
         set:
-          cert_manager_manifests: deploy-custom-manifests.yaml
+          custom_manifests: deploy-custom-manifests.yaml
diff --git a/manifests/custom-cert-manager-manifests.yaml b/manifests/custom-cert-manager-manifests.yaml
@@ -1 +1 @@
-###ZARF_VAR_CERT_MANAGER_MANIFESTS###
+###ZARF_VAR_CUSTOM_MANIFESTS###
diff --git a/renovate.json b/renovate.json
@@ -2,113 +2,26 @@
   "enabled": true,
   "forkProcessing": "enabled",
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    ":dependencyDashboard",
+   "extends": [
+    "github>defenseunicorns/uds-common//config/renovate.json5",
     ":semanticPrefixFixDepsChoreOthers",
     "config:base",
     "group:all",
     "replacements:all",
     "workarounds:all"
   ],
-  "timezone": "America/New_York",
-  "rebaseStalePrs": true,
-  "schedule": ["after 7am and before 9am every weekday"],
-  "dependencyDashboard": true,
-  "dependencyDashboardTitle": "Renovate Dashboard 🤖",
-  "rebaseWhen": "conflicted",
-  "commitBodyTable": true,
-  "suppressNotifications": ["prIgnoreNotification"],
-  "pre-commit": {
-    "enabled": true
-  },
-  "helm-values": {
-    "fileMatch": ["./.+\\.yaml$"]
-  },
-  "kubernetes": {
-    "fileMatch": ["\\.yaml$"],
-    "ignorePaths": [
-      ".github"
-    ]
-  },
-  "hostRules": [
-    {
-      "matchHost": "registry1.dso.mil",
-      "hostType": "docker",
-      "description": "Encrypted creds for registry1, scoped to this Github org using: https://github.com/renovatebot/renovate/blob/main/docs/usage/configuration-options.md#encrypted",
-      "encrypted": {
-        "username": "wcFMA/xDdHCJBTolAQ//a+5GNAOsD/UOKnqJDdbPRr73EXRgyRdtMOIqDyjGZIKcdVo64StgUb1O37O5bazoyGeYkcISaWjInxRuoBOxqFhdo5cTUIJavjm2Sn75OWCDBUr2Q5/OSluQDbp7QO9g4+cHxcjtldlMswZg0RIoSX8rtAcNvJePvuWDKRHmUSDbWrNoAPaqOUvBIUF+BUR8o2UtKY4c986B9sqz1/ZiyL7vmenuoFi36MPpq123b6xra9/Q8Zb+AGZY6guhI0kmmSvLPwuNpU/W9ocpaUW1jOgJdYDowZqoTC27uozw1rCq38ybL94GMeG+pzWJd7LBVbfpDnU10j5UC5l5coxghh8dBYNzirsRbYW9KMV3CSeRNxOqfUuJ9AfWekCBWQMkueDtop+lzZhpvsPnXYTV6V0+TE+W5lg0wApcGUNM5XsEHV/gchSULZCWUTHpyZfkUoyc3dXax7K9LawrNLLpJg3Oz0c5Y4WXS1SqfY3U6n84Q95URZC+uRl5BqzBwQSQYbWsnon+g3My+GukdhHlynoiJwQo/ch5gIfgiA59VrL/H9L/ABAyYzQ7KUEguQrNh8hbNG0dfpMLMIrdUDhno5vTeccx2k5R/EOQopxZCY+k2Xfqgg5okAG9eQKhhGKcQD+A8y6X2V0cPkHQ35TCi5AObrcQiiemBZUy3G6IJIrSdQFEs+WcBPT4GPgOAsZWUJKU4RU3qdhdUGZy/VwJSsB05/E65fRTGl5i0e5PhIoIbh4uaPgWnbJyvKi87bIIJhe9bxP/m2lDs5GPeXSrvBb0GT3t9l3aHUYW3uKp5GABwmvX6ptMbNoYoQRSLptR/gE80RPFSQ",
-        "password": "wcFMA/xDdHCJBTolAQ//bu2ZFKmMysjpkOkwQSgLigvUMDw1SHpp1YN8y1LerOqMfTocdswihRFbB/FFRP/bYG1ByhnAvxqhbdV0TRQqYTRXZehrlT+SDEVEJyK9eGS+ozClbccG64ebZSJ4y9rMFW3sK4Ja9ZyAEsX0S4vO88XwJhtOYmMGTXLlcSfiANQB8a9jISzov27FQOzdPx6cEd19FGxmX5vAdH9FWDwhVA6QSTrip4h5tZ6THylNc3md2TGRYUVTxMtsZdp/bnhv+I3LqmodR0vEP9Or/dbhtqnMy2sdS6HsANUaZ+7j4D0qDL7EEcxk+CHM5lM2sSz6u4+J4u01XDkn0HJ/mShPDSWUoU01Va/ZpRL8zw/bjKApDBSgvBOwF7eXfUKqLrg2zURm2quUf7XwuVTXmBMg3DSEuRBlW8kM0rGWGyv7U62sx+2zjK0v2uNHJz0hzWaEfriOQu4B7/avb+CIupfVYGNllyMTuB2ySDMLKN3Q/EB7q97apWqwcnThxRhK7t3e59ea4JDxodxeeTG3m/UgBLBlXCutk7BsC7NQPaSeOzV7mw6AOVQz+Bn0DAGd1x03ITYAcgfYvSW7VCfhrvnmuSVICHA7GTYevC7RBYhexWdgHZb98mIt1vVA2C+h7eqsx+xWhHQFE2+lNRTRmj9ccU/6qz1+3zqHdMQ/WD8MLofSdgFLU/A7qljUm/dk1MEVMtGznukdRpJJV4PsEcwh2OV/9is5KPyFQ83M7sl3/fY+CBaHFEiT4j/bSBznmxL3TuAjMdIT7j0cNsOxnsHllgRHL1qG3S2ZmAQ0Ex4gIUUGn2VbZLyRogJspsjxx5ZYuuYVfhtSaTU"
-      }
-    }
-  ],
-  "regexManagers": [
-    {
-      "fileMatch": [".*\\.ya?ml$"],
-      "matchStrings": [
-        "# renovate: datasource=helm\n .*- name: (?<depName>.*?)\n *url: (?<registryUrl>.*?)\n *version: (?<currentValue>.*)\n"
-      ],
-      "datasourceTemplate": "helm",
-      "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?<version>.*)${{/if}}"
-    },
-    {
-      "fileMatch": [".*\\.ya?ml$"],
-      "matchStrings": [
-        "# renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( extractVersion=(?<extractVersion>.*?))?( registryUrl=(?<registryUrl>.*?))?\\s.*?:\\s*['\"]?(?<currentValue>.*?)['\"]?\\s"
-      ],
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}",
-      "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?<version>.*)${{/if}}"
-    },
-    {
-      "fileMatch": [".*\\.ya?ml$"],
-      "matchStrings": [
-        "# renovate: zarf-uri datasource=github-tags depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?uri: ['\"]https:\\/\\/github.com\\/defenseunicorns\\/zarf\\/releases\\/download\\/(?<currentValue>.*)\\/zarf_.*_Linux_amd64['\"]",
-        "# renovate: zarf-uri datasource=github-tags depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?uri: ['\"]https:\\/\\/github.com\\/defenseunicorns\\/zarf\\/releases\\/download\\/.*\\/zarf_(?<currentValue>.*)_Linux_amd64['\"]"
-      ],
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}",
-      "datasourceTemplate": "github-tags"
-    },
-    {
-      "fileMatch": [".*\/?zarf\\.ya?ml$"],
-      "matchStrings": [
-        "- [\\'\"]?(?<depName>[^\"\\'\\s]+):(?<currentValue>[^\"\\'\\s]+)[\\'\"]?"
-      ],
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}",
-      "datasourceTemplate": "docker",
-      "extractVersionTemplate": "{{#if extractVersion}}{{{extractVersion}}}{{else}}^(?<version>.*)${{/if}}"
-    },
-    {
-      "fileMatch": [
-        "(^|/)zarf.yaml$"
-      ],
-      "matchStringsStrategy": "recursive",
-      "matchStrings": [
-        "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)",
-        "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-)",
-        "(?m)name: (?<depName>.+)(.|\\n)*?url: (?<registryUrl>.+)(.|\\n)*?version: (?<currentValue>.+)"
-      ],
-      "datasourceTemplate": "helm"
-    },
-    {
-      "fileMatch": [
-        "(^|/)zarf.yaml$"
-      ],
-      "matchStringsStrategy": "recursive",
-      "matchStrings": [
-        "(?m)charts:(.|\\n)*?(^\\s{4}[\\w:]+|\\n$|^\\s{2}-)",
-        "(?m)name:(.|\\n)+?(^\\s{4}[\\w\\-:]+|\\n$|^\\s{2}-)",
-        "(?m)name: (?<depName>.+)(.|\\n)*?version: (?<currentValue>.+)(.|\\n)*?url: (?<registryUrl>.+)"
-      ],
-      "datasourceTemplate": "helm"
-    }
-  ],
-    "packageRules": [
+  "packageRules": [
     {
       "datasources": ["docker", "helm"],
       "commitMessageTopic": "{{depName}}",
       "commitMessageExtra": "to {{#if isSingleVersion}}v{{{toVersion}}}{{else}}{{{newValue}}}{{/if}}",
       "enabled": true,
       "separateMinorPatch": true,
-      "groupName": "Charts and Images"
+      "groupName": "Charts and Images",
+      "matchPackageNames": ["quay.io/jetstack/cert-manager-cainjector",
+      "quay.io/jetstack/cert-manager-webhook",
+      "quay.io/jetstack/cert-manager-controller"],
+      "allowedVersions": "!/608111629/"
     }
   ]
 }
diff --git a/tasks.yaml b/tasks.yaml
@@ -1,17 +1,34 @@
 includes:
   - setup: ./tasks/setup.yaml
+  - common-setup: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.2.0/tasks/setup.yaml
   - create: ./tasks/create.yaml
   - deploy: ./tasks/deploy.yaml
   - remove: ./tasks/remove.yaml
-  - publish: ./tasks/publish.yaml
+  - publish: https://raw.githubusercontent.com/defenseunicorns/uds-common/v0.2.0/tasks/publish.yaml
 
 variables:
   - name: FLAVOR
-  - name: CERT_MANAGER_VALUES
-  - name: CERT_MANAGER_MANIFESTS
+  - name: CUSTOM_VALUES
+  - name: CUSTOM_MANIFESTS
   - name: CONFIGURE_FOR_ISTIO
 
 tasks:
+  - name: default
+    actions:
+      - task: create:package
+      - task: setup:k3d-no-istio
+      - task: deploy:package
+        with:
+          options: "--components=deploy-custom-manifests --set custom_manifests=examples/deploy-custom-manifests.yaml --set custom_values=.github/ci-values/values-override.yaml"
+
+  - name: test-with-istio
+    actions:
+      - task: create:package
+      - task: setup:core-istio
+      - task: deploy:package
+        with:
+          options: "--components=deploy-custom-manifests --set custom_manifests=examples/deploy-custom-manifests.yaml --set custom_values=.github/ci-values/values-override.yaml"
+
   - name: setup-cluster-no-istio
     actions:
       - task: setup:k3d-no-istio
@@ -20,18 +37,31 @@ tasks:
     actions:
       - task: setup:core-istio
 
-  - name: create-pkg-flavor
+  - name: create-pkg
+    actions:
+      - task: create:package
+        with:
+          options: ${CREATE_OPTIONS}
+
+  - name: deploy-pkg
     actions:
-      - task: create:cert-manager-pkg-flavor
+      - task: deploy:package
+        with:
+          options: ${DEPLOY_OPTIONS}
 
-  - name: deploy-pkg-flavor
+  - name: remove-pkg
     actions:
-      - task: deploy:cert-manager-pkg-flavor
+      - task: remove:package
 
-  - name: remove-pkg-flavor
+  - name: publish-pkg
     actions:
-      - task: remove:cert-manager-pkg-flavor
+      - task: publish:package
 
-  - name: publish-pkg-flavor
+  - name: registry-login
     actions:
-      - task: publish:cert-manager-pkg-flavor
+      - task: common-setup:registry-login
+        with:
+          registry: ${REGISTRY}
+          registryUsername: ${REGISTRY_USERNAME}
+          registryPassword: ${REGISTRY_PASSWORD}
+          registryRetryInterval: ${REGISTRY_RETRY_INTERVAL}
diff --git a/tasks/create.yaml b/tasks/create.yaml
@@ -1,5 +1,12 @@
+variables:
+  - name: FLAVOR
+    default: "upstream"
+
 tasks:
-  - name: cert-manager-pkg-flavor
+  - name: package
     description: "Create pkg flavor of Cert-Manager"
+    inputs:
+      options:
+        description: "For setting deploy time variables and flags"
     actions:
-      - cmd: zarf package create . --flavor=${FLAVOR} --confirm
+      - cmd: zarf package create --flavor=${FLAVOR} --confirm ${{ .inputs.options }}
diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml
@@ -1,5 +1,8 @@
 tasks:
-  - name: cert-manager-pkg-flavor
+  - name: package
     description: "Deploy pkg flavor of Cert-Manager"
+    inputs:
+      options:
+        description: "For setting zarf vars"
     actions:
-      - cmd: zarf package deploy zarf-package-*.zst --components=deploy-custom-manifests --set CERT_MANAGER_MANIFESTS=${CERT_MANAGER_MANIFESTS} --set CERT_MANAGER_VALUES=${CERT_MANAGER_VALUES} --set CONFIGURE_FOR_ISTIO=${CONFIGURE_FOR_ISTIO} --confirm
+      - cmd: zarf package deploy zarf-package-*.zst ${{ .inputs.options }} --confirm
diff --git a/tasks/publish.yaml b/tasks/publish.yaml
diff --git a/tasks/remove.yaml b/tasks/remove.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: cert-manager-pkg-flavor
+  - name: package
     description: "Remove pkg flavor of Cert-Manager"
     actions:
       - cmd: zarf package remove zarf-package-*.zst --confirm
diff --git a/values/deploy-cert-manager-values.yaml b/values/deploy-cert-manager-values.yaml
@@ -1 +1 @@
-###ZARF_VAR_CERT_MANAGER_VALUES###
+###ZARF_VAR_CUSTOM_VALUES###
diff --git a/zarf-config.yaml b/zarf-config.yaml
@@ -3,6 +3,6 @@ package:
     max_package_size: "1000000000"
   deploy:
     set:
-      cert_manager_values: deploy-cert-manager-values.yaml
-      cert_manager_manifests: deploy-custom-cert-manager-manifests.yaml
+      custom_values: deploy-cert-manager-values.yaml
+      custom_manifests: deploy-custom-cert-manager-manifests.yaml
       configure_for_istio: "false"