Datago 30304/upgrading vault to 1.9.2 (#14)

* add staticSecretRenderInterval to injector (hashicorp#621) * make staticSecretRenderInterval default to empty string * update values schema to add staticSecretRenderInterval * add test for default value * adding changelog entry Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * Update jira action (hashicorp#644) * No longer check for Vault team membership * Tweak jira states and search parameters * remove support for the leader-elector container (hashicorp#649) * vault-helm 0.18.0 release (hashicorp#650) * Run CI tests in github workflows (hashicorp#657) Ports the bats unit, chart-verifier, and bats acceptance tests to use github workflows and actions. The acceptance tests run using kind, and run for multiple k8s versions, on pushes to the main branch. Adds a SKIP_CSI env check in the CSI acceptance test, set in the workflow if K8s version is less than 1.16. Adds kubeAdmConfigPatches to the kind config to allow testing the CSI provider on K8s versions prior to 1.21. Updates the Secrets Store CSI driver to 1.0.0 in tests. Makes the HA Vault tests more robust by waiting for all consul client pods to be Ready, and waits with a timeout for Vault to start responding as sealed (since the tests on GitHub runners were often failing at that point). Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> * Configurable PodDisruptionBudget for Injector (hashicorp#653) * Fix spelling error in server disruptionbudget test (hashicorp#654) * Make terminationGracePeriodSeconds configurable (hashicorp#659) Make terminationGracePeriodSeconds configurable for server pod * injector: ability to set deployment update strategy (continued) (hashicorp#661) Co-authored-by: Jason Hancock <jhancock@netskope.com> * csi: ability to set priorityClassName for csi daemonset pods (hashicorp#670) * Fixed a small typo (hashicorp#672) * Disable unit and acceptance tests in CircleCI (hashicorp#675) * update CONTRIBUTING.md (hashicorp#677) Link to the discuss forum instead of the old google group and irc channel. Add info about the CLA. * add namespace support for openshift route (hashicorp#679) * Add volumes and env vars to helm hook test pod (hashicorp#673) * Fix test typo * Add basic server-test Pod tests - This covers all existing functionality that matches what's present in server-statefulset.bats * Fix server-test helm hook Pod rendering - Properly adhere to the global.enabled flag and the presence of the injector.externalVaultAddr setting, the same way that the servers StatefulSet behaves * Add volumes and env vars to helm hook test pod - Uses the same extraEnvironmentVars, volumes and volumeMounts set on the server statefulset to configure the Vault server test pod used by the helm test hook - This is necessary in situations where TLS is configured, but the certificates are not affiliated with the k8s CA / part of k8s PKI - Fixes hashicorpGH-665 * allow injection of TLS config for OpenShift routes (hashicorp#686) * Add some tests on top of hashicorp#396 * convert server-route.yaml to unix newlines * changelog Co-authored-by: André Becker <andre@arestless.com> Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * Release 0.19.0 (hashicorp#687) * Explain this fork in the README * Adding support for LoadBalancerIP field in ServiceSpec * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * Update to 0.4.0 * Explain this fork in the README * Adding support for LoadBalancerIP field in ServiceSpec * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * feat(DATAGO-27002): Upgrade vault to version 1.7.9 (#12) * Add objectSelector to webhookconfiguration (hashicorp#456) * changelog++ * Add CSI secrets store provider (hashicorp#461) * updating acceptance tests to k8s 1.17 on gke (hashicorp#473) * changelog++ * Target vault-csi-provider release 0.1.0 (hashicorp#475) * Update to 0.10.0 (hashicorp#477) * Update to v0.10.0 * Fix typo * Add csi link in changelog * Add volumes and mounts support for CSI (hashicorp#479) * Remove extraVolumes from CSI, add volumes and mounts * Add better example * changelog++ * Remove extra word in readme (hashicorp#482) * fix csi helm deployment (hashicorp#486) * fix serviceaccount and clusterrole name reference (full name) * add server.enabled option, align with documentation * add unit tests * update server.enabled behaviour to explicit true and update tests * changelog++ * add hostNetwork value to injector deployment (hashicorp#471) * add hostNetwork value to injector deployment * adding unit tests * changelog++ * feat(ingress): Extra paths to prepend to the ingress host configuration for annotation based services (hashicorp#460) Refs hashicorp#361 * changelog++ * Add logLevel and logFormat values for Vault (hashicorp#488) * Add logLevel and logFormat values for Vault * Add configurable tests * Update order of log levels * Update values.yaml * Update per review * Update test/unit/server-statefulset.bats Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> * Update test/unit/server-statefulset.bats Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> * changelog++ * Custom value of agent port (hashicorp#489) * configure the agent port * add unit test * remove default * remove default * Update values.yaml Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * changelog++ * Add injector agent default overrides (hashicorp#493) * Add injector agent default overrides * Update test/unit/injector-deployment.bats Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * Update test/unit/injector-deployment.bats Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * Update test/unit/injector-deployment.bats Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * changelog++ * [injector] Add port name in injector service (hashicorp#495) * [injector] Add port name in injector service * [injector] Hardcore port to https * changelog++ * Fix injector unit test failing (hashicorp#496) * Fix injector unit test failing * Add null check * Add default if unset for CI * Remove redundant logic (hashicorp#434) * Update to v0.11.0 (hashicorp#497) * Add container based tests documentation (hashicorp#492) * update documentation with running unit tests using container * promote bats version to 1.3.0 * Update CONTRIBUTING.md Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * Update CONTRIBUTING.md Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * Set kubeVersion and added chart-verifier tests (hashicorp#510) Set min kubeVersion in Chart.yaml to 1.14. Added a chart-verifier bats test, and configured to run it in CI. Some verification tests that haven't been addressed yet are skipped. * changelog++ * match kubeVersion on semver pre-releases (hashicorp#512) Since clouds like GKE set their kubeVersion as a pre-release (e.g. v1.17.17-gke.6700) * Add ImagePullSecrets to CSI daemonset (hashicorp#519) * changelog++ * changelog++ * fix CONTRIBUTING.md (hashicorp#501) * updating to use new dedicated context and token (hashicorp#515) * added values json schema (hashicorp#513) Generated the schema using the helm schema-gen plugin, and added extra data types to fields that allow it, such as annotations, tolerations, enabled, etc. Enabled the "contains-value-schema" chart-verifier test. Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * changelog++ * [Issue-520] tolerations for csi-daemonset (hashicorp#521) Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * changelog++ * Add extraArgs value for CSI (hashicorp#526) * changelog++ * add schema unit tests (hashicorp#530) * Add UI targetPort option (hashicorp#437) Use custom `targetPort` for UI service. See the usecase in hashicorp#385 (comment) * changelog++ * Update to v0.12.0 (hashicorp#532) * Update to v0.12.0 * Update values.schema.json * Fix schema types * revert image repo * Adding helm test for vault server (hashicorp#531) Also adds acceptance test for 'helm test' and updates the chart-verifier version. * changelog++ * fix ui.serviceNodePort schema (hashicorp#537) UI service nodePort defaults to null, but is set as an integer * changelog++ * change maxUnavailable to integer (hashicorp#535) change maxUnavailable from `null` to `integer` to enable upgrade from 0.11.0 to 0.12.0 when using the specific variable. * Also allow null value Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * add test for server.ha.disruptionBudget.maxUnavailable Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * changelog++ * use vault-helm-test:0.2.0 (hashicorp#543) * Added webhook-certs volume mount to sidecar injector (hashicorp#545) * Removed webhook-certs volume mount from leader-elector container * Added test: injector deployment manual TLS adds volume mount * changelog++ * Adding server.enterpriseLicense (hashicorp#547) Sets up a vault-enterprise license for autoloading on vault startup. Mounts an existing secret to /vault/license and sets VAULT_LICENSE_PATH appropriately. * changelog++ * Add openshift overrides (hashicorp#549) Adds default overrides for OpenShift (values.openshift.yaml) and uses them in the chart-verifier tests. * changelog++ * Update to v0.13.0 (hashicorp#554) * Explain this fork in the README * Adding support for LoadBalancerIP field in ServiceSpec * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * feat(DATAGO-27002): Upgrade to 1.7.9 * chore(DATAGO-27002): Fix doc issue Co-authored-by: guru1306 <tguru.ece@gmail.com> Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> Co-authored-by: Paul <paul.coignet@datadoghq.com> Co-authored-by: Arie Lev <34907201+ArieLevs@users.noreply.github.com> Co-authored-by: Paul Witt <paul_witt@discovery.com> Co-authored-by: Sam Marshall <8191402+samjmarshall@users.noreply.github.com> Co-authored-by: Hamza ZOUHAIR <34426028+HamzaZo@users.noreply.github.com> Co-authored-by: Javier Criado Marcos <javinavales.jcm@gmail.com> Co-authored-by: mehmetsalgar <salgarm@gmx.de> Co-authored-by: Sarah Thompson <sthompson@hashicorp.com> Co-authored-by: Iñigo Horcajo <inigohu@gmail.com> Co-authored-by: Rule88 <rule88@users.noreply.github.com> Co-authored-by: Ricardo Gândara Pinto <rpinto@gmail.com> Co-authored-by: Julian Setiawan <julian.setiawan@solace.com> Co-authored-by: marcboudreau <marc.boudreau@solace.com> Co-authored-by: Hadie Laham <hadie.laham@solace.com> * fix: deploy_local.sh error with file * minor changes * Adding support for LoadBalancerIP field in ServiceSpec * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * feat(DATAGO-27002): Upgrade vault to version 1.7.9 (#12) * Add objectSelector to webhookconfiguration (hashicorp#456) * changelog++ * Add CSI secrets store provider (hashicorp#461) * updating acceptance tests to k8s 1.17 on gke (hashicorp#473) * changelog++ * Target vault-csi-provider release 0.1.0 (hashicorp#475) * Update to 0.10.0 (hashicorp#477) * Update to v0.10.0 * Fix typo * Add csi link in changelog * Add volumes and mounts support for CSI (hashicorp#479) * Remove extraVolumes from CSI, add volumes and mounts * Add better example * changelog++ * Remove extra word in readme (hashicorp#482) * fix csi helm deployment (hashicorp#486) * fix serviceaccount and clusterrole name reference (full name) * add server.enabled option, align with documentation * add unit tests * update server.enabled behaviour to explicit true and update tests * changelog++ * add hostNetwork value to injector deployment (hashicorp#471) * add hostNetwork value to injector deployment * adding unit tests * changelog++ * feat(ingress): Extra paths to prepend to the ingress host configuration for annotation based services (hashicorp#460) Refs hashicorp#361 * changelog++ * Add logLevel and logFormat values for Vault (hashicorp#488) * Add logLevel and logFormat values for Vault * Add configurable tests * Update order of log levels * Update values.yaml * Update per review * Update test/unit/server-statefulset.bats Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> * Update test/unit/server-statefulset.bats Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> * changelog++ * Custom value of agent port (hashicorp#489) * configure the agent port * add unit test * remove default * remove default * Update values.yaml Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * changelog++ * Add injector agent default overrides (hashicorp#493) * Add injector agent default overrides * Update test/unit/injector-deployment.bats Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * Update test/unit/injector-deployment.bats Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * Update test/unit/injector-deployment.bats Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * changelog++ * [injector] Add port name in injector service (hashicorp#495) * [injector] Add port name in injector service * [injector] Hardcore port to https * changelog++ * Fix injector unit test failing (hashicorp#496) * Fix injector unit test failing * Add null check * Add default if unset for CI * Remove redundant logic (hashicorp#434) * Update to v0.11.0 (hashicorp#497) * Add container based tests documentation (hashicorp#492) * update documentation with running unit tests using container * promote bats version to 1.3.0 * Update CONTRIBUTING.md Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * Update CONTRIBUTING.md Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * Set kubeVersion and added chart-verifier tests (hashicorp#510) Set min kubeVersion in Chart.yaml to 1.14. Added a chart-verifier bats test, and configured to run it in CI. Some verification tests that haven't been addressed yet are skipped. * changelog++ * match kubeVersion on semver pre-releases (hashicorp#512) Since clouds like GKE set their kubeVersion as a pre-release (e.g. v1.17.17-gke.6700) * Add ImagePullSecrets to CSI daemonset (hashicorp#519) * changelog++ * changelog++ * fix CONTRIBUTING.md (hashicorp#501) * updating to use new dedicated context and token (hashicorp#515) * added values json schema (hashicorp#513) Generated the schema using the helm schema-gen plugin, and added extra data types to fields that allow it, such as annotations, tolerations, enabled, etc. Enabled the "contains-value-schema" chart-verifier test. Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> * changelog++ * [Issue-520] tolerations for csi-daemonset (hashicorp#521) Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * changelog++ * Add extraArgs value for CSI (hashicorp#526) * changelog++ * add schema unit tests (hashicorp#530) * Add UI targetPort option (hashicorp#437) Use custom `targetPort` for UI service. See the usecase in hashicorp#385 (comment) * changelog++ * Update to v0.12.0 (hashicorp#532) * Update to v0.12.0 * Update values.schema.json * Fix schema types * revert image repo * Adding helm test for vault server (hashicorp#531) Also adds acceptance test for 'helm test' and updates the chart-verifier version. * changelog++ * fix ui.serviceNodePort schema (hashicorp#537) UI service nodePort defaults to null, but is set as an integer * changelog++ * change maxUnavailable to integer (hashicorp#535) change maxUnavailable from `null` to `integer` to enable upgrade from 0.11.0 to 0.12.0 when using the specific variable. * Also allow null value Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * add test for server.ha.disruptionBudget.maxUnavailable Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> * changelog++ * use vault-helm-test:0.2.0 (hashicorp#543) * Added webhook-certs volume mount to sidecar injector (hashicorp#545) * Removed webhook-certs volume mount from leader-elector container * Added test: injector deployment manual TLS adds volume mount * changelog++ * Adding server.enterpriseLicense (hashicorp#547) Sets up a vault-enterprise license for autoloading on vault startup. Mounts an existing secret to /vault/license and sets VAULT_LICENSE_PATH appropriately. * changelog++ * Add openshift overrides (hashicorp#549) Adds default overrides for OpenShift (values.openshift.yaml) and uses them in the chart-verifier tests. * changelog++ * Update to v0.13.0 (hashicorp#554) * Explain this fork in the README * Adding support for LoadBalancerIP field in ServiceSpec * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * DATAGO-13861: Adding support for logrotate * DATAGO-13861: Adding audit log rotation and shipment to datdog * Fixing minor typos and removing extra lines * feat(DATAGO-27002): Upgrade to 1.7.9 * chore(DATAGO-27002): Fix doc issue Co-authored-by: guru1306 <tguru.ece@gmail.com> Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> Co-authored-by: Paul <paul.coignet@datadoghq.com> Co-authored-by: Arie Lev <34907201+ArieLevs@users.noreply.github.com> Co-authored-by: Paul Witt <paul_witt@discovery.com> Co-authored-by: Sam Marshall <8191402+samjmarshall@users.noreply.github.com> Co-authored-by: Hamza ZOUHAIR <34426028+HamzaZo@users.noreply.github.com> Co-authored-by: Javier Criado Marcos <javinavales.jcm@gmail.com> Co-authored-by: mehmetsalgar <salgarm@gmx.de> Co-authored-by: Sarah Thompson <sthompson@hashicorp.com> Co-authored-by: Iñigo Horcajo <inigohu@gmail.com> Co-authored-by: Rule88 <rule88@users.noreply.github.com> Co-authored-by: Ricardo Gândara Pinto <rpinto@gmail.com> Co-authored-by: Julian Setiawan <julian.setiawan@solace.com> Co-authored-by: marcboudreau <marc.boudreau@solace.com> Co-authored-by: Hadie Laham <hadie.laham@solace.com> * changed value to use tag 1.9.6 Co-authored-by: Kaito Ii <kaitoii1111@gmail.com> Co-authored-by: Theron Voran <tvoran@users.noreply.github.com> Co-authored-by: Tom Proctor <tomhjp@users.noreply.github.com> Co-authored-by: Eric Miller <eric.the.miller@icloud.com> Co-authored-by: Takumi Sue <23391543+mikutas@users.noreply.github.com> Co-authored-by: Jason Hancock <jhancock@netskope.com> Co-authored-by: Vadim Grek <vadimprog@gmail.com> Co-authored-by: nikstur <61635709+nikstur@users.noreply.github.com> Co-authored-by: Jacob Mammoliti <jmammoliti@hashicorp.com> Co-authored-by: Ethan J. Brown <Iristyle@users.noreply.github.com> Co-authored-by: Michele Baldessari <michele@acksyn.org> Co-authored-by: André Becker <andre@arestless.com> Co-authored-by: Julian Setiawan <julian.setiawan@solace.com> Co-authored-by: marcboudreau <marc.boudreau@solace.com> Co-authored-by: Hadie Laham <hadie.laham@solace.com> Co-authored-by: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com> Co-authored-by: Subhrajit Nag <92374747+nagsubhrajitt@users.noreply.github.com> Co-authored-by: guru1306 <tguru.ece@gmail.com> Co-authored-by: Paul <paul.coignet@datadoghq.com> Co-authored-by: Arie Lev <34907201+ArieLevs@users.noreply.github.com> Co-authored-by: Paul Witt <paul_witt@discovery.com> Co-authored-by: Sam Marshall <8191402+samjmarshall@users.noreply.github.com> Co-authored-by: Hamza ZOUHAIR <34426028+HamzaZo@users.noreply.github.com> Co-authored-by: Javier Criado Marcos <javinavales.jcm@gmail.com> Co-authored-by: mehmetsalgar <salgarm@gmx.de> Co-authored-by: Sarah Thompson <sthompson@hashicorp.com> Co-authored-by: Iñigo Horcajo <inigohu@gmail.com> Co-authored-by: Rule88 <rule88@users.noreply.github.com> Co-authored-by: Ricardo Gândara Pinto <rpinto@gmail.com> Co-authored-by: adhish2001 <adhish.maheswaran@solace.com>
SolaceDev · Jul 31, 2023 · 0672d4b · 0672d4b
1 parent bc44cb1
commit 0672d4b
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 9 deletions.
diff --git a/templates/injector-deployment.yaml b/templates/injector-deployment.yaml
@@ -140,7 +140,13 @@ spec:
             periodSeconds: 2
             successThreshold: 1
             timeoutSeconds: 5
-        {{- if and (eq (.Values.injector.leaderElector.enabled | toString) "true") (gt (.Values.injector.replicas | int) 1) (eq (.Values.injector.leaderElector.useContainer | toString) "true") }}
+{{- if .Values.injector.certs.secretName }}
+          volumeMounts:
+            - name: webhook-certs
+              mountPath: /etc/webhook/certs
+              readOnly: true
+{{- end }}
+        {{- if and (eq (.Values.injector.leaderElector.enabled | toString) "true") (gt (.Values.injector.replicas | int) 1) }}
         - name: leader-elector
           image: {{ .Values.injector.leaderElector.image.repository }}:{{ .Values.injector.leaderElector.image.tag }}
           args:
@@ -169,12 +175,6 @@ spec:
             successThreshold: 1
             timeoutSeconds: 5
         {{- end }}
-{{- if .Values.injector.certs.secretName }}
-          volumeMounts:
-            - name: webhook-certs
-              mountPath: /etc/webhook/certs
-              readOnly: true
-{{- end }}
 {{- if .Values.injector.certs.secretName }}
       volumes:
         - name: webhook-certs

diff --git a/test/acceptance/csi.bats b/test/acceptance/csi.bats
@@ -2,7 +2,15 @@
 
 load _helpers
 
+check_skip_csi() {
+  if [ ! -z ${SKIP_CSI} ]; then
+    skip "Skipping CSI tests"
+  fi
+}
+
 @test "csi: testing deployment" {
+  check_skip_csi
+
   cd `chart_dir`
   kubectl delete namespace acceptance --ignore-not-found=true
   kubectl create namespace acceptance
@@ -49,6 +57,8 @@ load _helpers
 
 # Clean up
 teardown() {
+  check_skip_csi
+
   if [[ ${CLEANUP:-true} == "true" ]]
   then
       echo "helm/pvc teardown"

diff --git a/test/unit/csi-daemonset.bats b/test/unit/csi-daemonset.bats
@@ -53,6 +53,29 @@ load _helpers
   [ "${actual}" = "true" ]
 }
 
+# priorityClassName
+
+@test "csi/daemonset: priorityClassName not set by default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/csi-daemonset.yaml  \
+      --set "csi.enabled=true" \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec | .priorityClassName? == null' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
+@test "csi/daemonset: priorityClassName can be set" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/csi-daemonset.yaml  \
+      --set 'csi.priorityClassName=armaggeddon' \
+      --set "csi.enabled=true" \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec | .priorityClassName == "armaggeddon"' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
 # serviceAccountName reference name
 @test "csi/daemonset: serviceAccountName reference name" {
   cd `chart_dir`

diff --git a/test/unit/injector-deployment.bats b/test/unit/injector-deployment.bats
@@ -913,3 +913,56 @@ EOF
       yq -r 'map(select(.name=="AGENT_INJECT_TEMPLATE_CONFIG_EXIT_ON_RETRY_FAILURE")) | .[] .value' | tee /dev/stderr)
   [ "${value}" = "false" ]
 }
+@test "injector/deployment: agent default template_config.static_secret_render_interval" {
+  cd `chart_dir`
+  local object=$(helm template \
+      --show-only templates/injector-deployment.yaml  \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
+
+  local value=$(echo $object |
+      yq -r 'map(select(.name=="AGENT_INJECT_TEMPLATE_STATIC_SECRET_RENDER_INTERVAL")) | .[] .value' | tee /dev/stderr)
+  [ "${value}" = "" ]
+}
+
+@test "injector/deployment: can set agent template_config.static_secret_render_interval" {
+  cd `chart_dir`
+  local object=$(helm template \
+      --show-only templates/injector-deployment.yaml  \
+      --set='injector.agentDefaults.templateConfig.staticSecretRenderInterval=1m' \
+      . | tee /dev/stderr |
+      yq -r '.spec.template.spec.containers[0].env' | tee /dev/stderr)
+
+  local value=$(echo $object |
+      yq -r 'map(select(.name=="AGENT_INJECT_TEMPLATE_STATIC_SECRET_RENDER_INTERVAL")) | .[] .value' | tee /dev/stderr)
+  [ "${value}" = "1m" ]
+}
+
+@test "injector/deployment: strategy default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/injector-deployment.yaml  \
+      . | tee /dev/stderr |
+      yq -r '.spec.strategy' | tee /dev/stderr)
+  [ "${actual}" = "null" ]
+}
+
+@test "injector/deployment: strategy set as string" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/injector-deployment.yaml  \
+      --set="injector.strategy=testing"  \
+      . | tee /dev/stderr |
+      yq -r '.spec.strategy' | tee /dev/stderr)
+  [ "${actual}" = "testing" ]
+}
+
+@test "injector/deployment: strategy can be set as YAML" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      --show-only templates/injector-deployment.yaml \
+      --set 'injector.strategy.rollingUpdate.maxUnavailable=1' \
+      . | tee /dev/stderr |
+      yq -r '.spec.strategy.rollingUpdate.maxUnavailable' | tee /dev/stderr)
+  [ "${actual}" = "1" ]
+}
diff --git a/test/unit/injector-disruptionbudget.bats b/test/unit/injector-disruptionbudget.bats
@@ -51,4 +51,4 @@ load _helpers
       . | tee /dev/stderr |
       yq '.apiVersion == "policy/v1"' | tee /dev/stderr)
   [ "${actual}" = "true" ]
-}
+}
diff --git a/test/unit/server-ha-disruptionbudget.bats b/test/unit/server-ha-disruptionbudget.bats
@@ -120,4 +120,4 @@ load _helpers
       . | tee /dev/stderr |
       yq '.apiVersion == "policy/v1"' | tee /dev/stderr)
   [ "${actual}" = "true" ]
-}
+}
diff --git a/test/unit/server-route.bats b/test/unit/server-route.bats
@@ -179,3 +179,41 @@ load _helpers
       yq -r '.spec.tls.insecureEdgeTerminationPolicy' | tee /dev/stderr)
   [ "${actual}" = "Redirect" ]
 }
+
+@test "server/route: OpenShift - route termination mode set to default passthrough" {
+  cd `chart_dir`
+
+  local actual=$(helm template \
+      --show-only templates/server-route.yaml \
+      --set 'global.openshift=true' \
+      --set 'server.route.enabled=true' \
+      . | tee /dev/stderr |
+      yq -r '.spec.tls.termination' | tee /dev/stderr)
+  [ "${actual}" = "passthrough" ]
+}
+
+@test "server/route: OpenShift - route termination mode set to edge" {
+  cd `chart_dir`
+
+  local actual=$(helm template \
+      --show-only templates/server-route.yaml \
+      --set 'global.openshift=true' \
+      --set 'server.route.enabled=true' \
+      --set 'server.route.tls.termination=edge' \
+      . | tee /dev/stderr |
+      yq -r '.spec.tls.termination' | tee /dev/stderr)
+  [ "${actual}" = "edge" ]
+}
+
+@test "server/route: OpenShift - route custom tls entry" {
+  cd `chart_dir`
+
+  local actual=$(helm template \
+      --show-only templates/server-route.yaml \
+      --set 'global.openshift=true' \
+      --set 'server.route.enabled=true' \
+      --set 'server.route.tls.insecureEdgeTerminationPolicy=Redirect' \
+      . | tee /dev/stderr |
+      yq -r '.spec.tls.insecureEdgeTerminationPolicy' | tee /dev/stderr)
+  [ "${actual}" = "Redirect" ]
+}
diff --git a/values.schema.json b/values.schema.json
@@ -53,6 +53,9 @@
                         }
                     }
                 },
+                "priorityClassName": {
+                    "type": "string"
+                },
                 "debug": {
                     "type": "boolean"
                 },
@@ -364,6 +367,9 @@
                 "podDisruptionBudget": {
                     "type": "object"
                 },
+                "podDisruptionBudget": {
+                    "type": "object"
+                },
                 "port": {
                     "type": "integer"
                 },